From 38ef2e90c7ab618d3928d179fba9aeda9d0c6af6 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sun, 11 Mar 2012 11:59:30 -0400
Subject: [PATCH] --- yaml --- r: 293933 b: refs/heads/master c:
 2215011dd9c1b01f1fc430620ed31f2baad267c3 h: refs/heads/master i:   293931:
 09212abbfce3a28ed4e2ec0870be84ca4b810fed v: v3

---
 [refs]                                | 2 +-
 trunk/arch/s390/include/asm/hardirq.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 63f74efacddb..510fab26c278 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3c652b533aab733bf3ffb50654fb82f079c5329
+refs/heads/master: 2215011dd9c1b01f1fc430620ed31f2baad267c3
diff --git a/trunk/arch/s390/include/asm/hardirq.h b/trunk/arch/s390/include/asm/hardirq.h
index e4155d3eb2cb..510ba9ef4248 100644
--- a/trunk/arch/s390/include/asm/hardirq.h
+++ b/trunk/arch/s390/include/asm/hardirq.h
@@ -18,6 +18,7 @@
 
 #define __ARCH_IRQ_STAT
 #define __ARCH_HAS_DO_SOFTIRQ
+#define __ARCH_IRQ_EXIT_IRQS_DISABLED
 
 #define HARDIRQ_BITS	8