From: Michael Neuling <mikey@neuling.org>
Date: Wed, 21 Oct 2009 20:15:43 +0000 (+0000)
Subject: powerpc: Fix potential compile error irqs_disabled_flags
X-Git-Tag: v2.6.33-rc1~293^2~97
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=0682d6c1044e8a54aafdc6282d44c0c436da208f;p=safe%2Fjmp%2Flinux-2.6

powerpc: Fix potential compile error irqs_disabled_flags

irqs_disabled_flags is #defined in linux/irqflags.h when
CONFIG_TRACE_IRQFLAGS_SUPPORT is enabled.  64 and 32 bit always have
CONFIG_TRACE_IRQFLAGS_SUPPORT enabled so just remove
irqs_disabled_flags.

This fixes the case when someone needs to include both linux/irqflags.h
and asm/hw_irq.h.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index abbc2aa..9f4c9d4f 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -64,11 +64,6 @@ 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)