| Message ID | 20120615045139.GA11041@pale.ozlabs.ibm.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, 2012-06-15 at 14:51 +1000, Paul Mackerras wrote: > At present, hard_irq_disable() does nothing on powerpc because of > this code in include/linux/interrupt.h: > > #ifndef hard_irq_disable > #define hard_irq_disable() do { } while(0) > #endif > > So we need to make our hard_irq_disable be a macro. > > Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Paul Mackerras <paulus@samba.org> Add: CC: <stable@kernel.org> [v3.4] Before sending to Linus so it hits stable automagically. Cheers, Ben. > -- > arch/powerpc/include/asm/hw_irq.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h > index c9aac24..32b394f 100644 > --- a/arch/powerpc/include/asm/hw_irq.h > +++ b/arch/powerpc/include/asm/hw_irq.h > @@ -100,6 +100,9 @@ static inline void hard_irq_disable(void) > get_paca()->irq_happened |= PACA_IRQ_HARD_DIS; > } > > +/* include/linux/interrupt.h needs hard_irq_disable to be a macro */ > +#define hard_irq_disable hard_irq_disable > + > /* > * This is called by asynchronous interrupts to conditionally > * re-enable hard interrupts when soft-disabled after having
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index c9aac24..32b394f 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h @@ -100,6 +100,9 @@ static inline void hard_irq_disable(void) get_paca()->irq_happened |= PACA_IRQ_HARD_DIS; } +/* include/linux/interrupt.h needs hard_irq_disable to be a macro */ +#define hard_irq_disable hard_irq_disable + /* * This is called by asynchronous interrupts to conditionally * re-enable hard interrupts when soft-disabled after having
At present, hard_irq_disable() does nothing on powerpc because of this code in include/linux/interrupt.h: #ifndef hard_irq_disable #define hard_irq_disable() do { } while(0) #endif So we need to make our hard_irq_disable be a macro. Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org> -- arch/powerpc/include/asm/hw_irq.h | 3 +++ 1 file changed, 3 insertions(+)