From a35522b3dff75fd22c110a719a06abd1b7766cc8 Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Thu, 26 Mar 2009 15:23:56 +0100
Subject: [PATCH] --- yaml --- r: 135599 b: refs/heads/master c:
 3324e60aafa9aeb1009878d45079b67367a5e2b6 h: refs/heads/master i:   135597:
 be765e9e2f5bed0ca550f0619c6eef1003e75ab3   135595:
 127d06460301223fed69c88e88522819b2ac7ff0   135591:
 d369b4fe45d4270cddf025ee6df29bfb4820b6a8   135583:
 7731bfe534d10634accca127a461166822d41432 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/kernel/smp.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0584ccae57e9..d7f5917d8e1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 431429ff788598a19c1a193b9fca3961b7f55916
+refs/heads/master: 3324e60aafa9aeb1009878d45079b67367a5e2b6
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index e279d0fbbbe8..a8858634dd05 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/cache.h>
 #include <linux/interrupt.h>
+#include <linux/irqflags.h>
 #include <linux/cpu.h>
 #include <linux/timex.h>
 #include <linux/bootmem.h>
@@ -75,6 +76,7 @@ void smp_send_stop(void)
 
 	/* Disable all interrupts/machine checks */
 	__load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
+	trace_hardirqs_off();
 
 	/* stop all processors */
 	for_each_online_cpu(cpu) {