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;