From 6cc2dd199a1c631678c402d6579e00e7d102463d Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 26 Mar 2009 15:23:59 +0100
Subject: [PATCH] --- yaml --- r: 135602 b: refs/heads/master c:
 cc54c1e66e4b90ab657464fec30e6970636ee23d h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/s390/s390mach.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6d893bed28d2..ca27f1820d37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92e6ecf392fac3082653ac9d84b1bdf53d0ea160
+refs/heads/master: cc54c1e66e4b90ab657464fec30e6970636ee23d
diff --git a/trunk/drivers/s390/s390mach.c b/trunk/drivers/s390/s390mach.c
index 92b0417f8e12..8e437052e076 100644
--- a/trunk/drivers/s390/s390mach.c
+++ b/trunk/drivers/s390/s390mach.c
@@ -357,8 +357,7 @@ s390_revalidate_registers(struct mci *mci)
 /*
  * machine check handler.
  */
-void
-s390_do_machine_check(struct pt_regs *regs)
+void notrace s390_do_machine_check(struct pt_regs *regs)
 {
 	static DEFINE_SPINLOCK(ipd_lock);
 	static unsigned long long last_ipd;