Patchwork powerpc: Fix potential compile error irqs_disabled_flags

login
register
mail settings
Submitter Michael Neuling
Date Oct. 22, 2009, 6:15 a.m.
Message ID <8702.1256192143@neuling.org>
Download mbox | patch
Permalink /patch/36647/
State Accepted
Commit 0682d6c1044e8a54aafdc6282d44c0c436da208f
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Michael Neuling - Oct. 22, 2009, 6:15 a.m.
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>
---
> 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(-)

Patch

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)