[PATCH] powerpc: Fix potential compile error irqs_disabled_flags

irqs_disabled_flags is #defined in linux/irqflags.h when
CONFIG_TRACE_IRQFLAGS_SUPPORT is enabled.

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

Signed-off-by: Michael Neuling <redacted>
---
I'm not sure if this is the right fix.  We could just remove
irqs_disabled_flags but I think that has the possibility of breaking
32bit.

 arch/powerpc/include/asm/hw_irq.h |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-2.6-ozlabs/arch/powerpc/include/asm/hw_irq.h
===================================================================

--- linux-2.6-ozlabs.orig/arch/powerpc/include/asm/hw_irq.h
+++ linux-2.6-ozlabs/arch/powerpc/include/asm/hw_irq.h

@@ -64,10 +64,12 @@ extern void iseries_handle_interrupts(vo
 		get_paca()->hard_enabled = 0;	\
 	} while(0)
 
+#ifndef CONFIG_TRACE_IRQFLAGS_SUPPORT
 static inline int irqs_disabled_flags(unsigned long flags)
 {
 	return flags == 0;
 }
+#endif
 
 #else
 

On Oct 22, 2009, at 12:58 AM, Michael Neuling wrote:

I think you can just remove irqs_disabled_flags as we always have  
CONFIG_TRACE_IRQFLAGS_SUPPORT (for both 32 and 64).

- k

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 <redacted>
---

I think you can just remove irqs_disabled_flags as we always have  
CONFIG_TRACE_IRQFLAGS_SUPPORT (for both 32 and 64).

Ok, thanks kumar.

 arch/powerpc/include/asm/hw_irq.h |    5 -----
 1 file changed, 5 deletions(-)

Index: linux-2.6-ozlabs/arch/powerpc/include/asm/hw_irq.h
===================================================================

--- linux-2.6-ozlabs.orig/arch/powerpc/include/asm/hw_irq.h
+++ linux-2.6-ozlabs/arch/powerpc/include/asm/hw_irq.h

@@ -64,11 +64,6 @@ extern void iseries_handle_interrupts(vo
 		get_paca()->hard_enabled = 0;	\
 	} while(0)
 
-static inline int irqs_disabled_flags(unsigned long flags)
-{
-	return flags == 0;
-}
-
 #else
 
 #if defined(CONFIG_BOOKE)