From 256913a7624913c1ccd6393016b49e11295ee604 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Wed, 14 May 2008 23:49:43 -0400
Subject: [PATCH] --- yaml --- r: 100547 b: refs/heads/master c:
 e0eca07badc023a675a61906020b397da20f07c3 h: refs/heads/master i:   100545:
 19811b75cd450c0c935c07435d68a86e8dfdfab9   100543:
 02d9e3b5141d6b33d000a5818b626561dd5ca356 v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-powerpc/hw_irq.h | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c88566c8ef0c..8da761ceb3ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 489f139614596cbc956a06f5e4bb41288e276fe3
+refs/heads/master: e0eca07badc023a675a61906020b397da20f07c3
diff --git a/trunk/include/asm-powerpc/hw_irq.h b/trunk/include/asm-powerpc/hw_irq.h
index ad8c9f7fd0e3..f75a5fc64d2e 100644
--- a/trunk/include/asm-powerpc/hw_irq.h
+++ b/trunk/include/asm-powerpc/hw_irq.h
@@ -59,6 +59,11 @@ extern void iseries_handle_interrupts(void);
 		get_paca()->hard_enabled = 0;	\
 	} while(0)
 
+static inline int irqs_disabled_flags(unsigned long flags)
+{
+	return flags == 0;
+}
+
 #else
 
 #if defined(CONFIG_BOOKE)
@@ -113,6 +118,11 @@ static inline void local_irq_save_ptr(unsigned long *flags)
 #define hard_irq_enable()	local_irq_enable()
 #define hard_irq_disable()	local_irq_disable()
 
+static inline int irqs_disabled_flags(unsigned long flags)
+{
+	return (flags & MSR_EE) == 0;
+}
+
 #endif /* CONFIG_PPC64 */
 
 /*