---

yaml --- r: 135602 b: refs/heads/master c: cc54c1e h: refs/heads/master v: v3
git-mirror · Mar 26, 2009 · 6cc2dd1 · 6cc2dd1
1 parent b2de0ac
commit 6cc2dd1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;