* [PATCH] powerpc: Fix potential compile error irqs_disabled_flags
@ 2009-10-22 5:58 Michael Neuling
2009-10-22 6:03 ` Kumar Gala
0 siblings, 1 reply; 3+ messages in thread
From: Michael Neuling @ 2009-10-22 5:58 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev, kumar.gala
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 <mikey@neuling.org>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc: Fix potential compile error irqs_disabled_flags
2009-10-22 5:58 [PATCH] powerpc: Fix potential compile error irqs_disabled_flags Michael Neuling
@ 2009-10-22 6:03 ` Kumar Gala
2009-10-22 6:15 ` Michael Neuling
0 siblings, 1 reply; 3+ messages in thread
From: Kumar Gala @ 2009-10-22 6:03 UTC (permalink / raw)
To: Michael Neuling; +Cc: linux-ppc list
On Oct 22, 2009, at 12:58 AM, Michael Neuling wrote:
> 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 <mikey@neuling.org>
> ---
> 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
I think you can just remove irqs_disabled_flags as we always have
CONFIG_TRACE_IRQFLAGS_SUPPORT (for both 32 and 64).
- k
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] powerpc: Fix potential compile error irqs_disabled_flags
2009-10-22 6:03 ` Kumar Gala
@ 2009-10-22 6:15 ` Michael Neuling
0 siblings, 0 replies; 3+ messages in thread
From: Michael Neuling @ 2009-10-22 6:15 UTC (permalink / raw)
To: Kumar Gala, benh; +Cc: linux-ppc list
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(-)
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)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-10-22 6:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-22 5:58 [PATCH] powerpc: Fix potential compile error irqs_disabled_flags Michael Neuling
2009-10-22 6:03 ` Kumar Gala
2009-10-22 6:15 ` Michael Neuling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).