From: Steven Rostedt <rostedt@goodmis.org>
Date: Thu, 15 May 2008 03:49:43 +0000 (-0400)
Subject: ftrace, POWERPC: add irqs_disabled_flags to ppc
X-Git-Tag: v2.6.27-rc1~1102^2^2~1^2~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e0eca07badc023a675a61906020b397da20f07c3;p=linux-2.6-omap-h63xx.git

ftrace, POWERPC: add irqs_disabled_flags to ppc

PPC doesn't have the irqs_disabled_flags needed by ftrace.
This patch adds it.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/asm-powerpc/hw_irq.h b/include/asm-powerpc/hw_irq.h
index ad8c9f7fd0e..f75a5fc64d2 100644
--- a/include/asm-powerpc/hw_irq.h
+++ b/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 */
 
 /*