Skip to contentSkip to conversation

powerpc: Fix potential compile error irqs_disabled_flags

PATCH In review Michael Neuling 2 participants 3 messages Oct 22, 2009 PowerPC

lore
Share & tools
lore

Michael Neuling

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---
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(+)
arch/powerpc/include/asm/hw_irq.h +2 -0
Index: 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
#1 lore raw
Quoted 20 lines · Michael Neuling

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 <[email protected]>

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

arch/powerpc/include/asm/hw_irq.h extern void iseries_handle_interrupts(vo · line 72

Quoted 9 lines
arch/powerpc/include/asm/hw_irq.h +2 -0
@@ -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

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

- k

author
#2 lore raw

PATCH 1/1 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 <[email protected]>

---

Quoted 2 lines

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(-)
arch/powerpc/include/asm/hw_irq.h +0 -5
Index: 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)