[lkml]   [2012]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[ 28/61] Make hard_irq_disable() actually hard-disable interrupts
3.4-stable review patch.  If anyone has any objections, please let me know.


From: Paul Mackerras <>

commit f948501b36c6b3d9352ce212a197098a7e958971 upstream.

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)

So we need to make our hard_irq_disable be a macro. It was previously
a macro until commit 7230c56441 ("powerpc: Rework lazy-interrupt
handling") changed it to a static inline function.

Acked-by: Benjamin Herrenschmidt <>
Signed-off-by: Paul Mackerras <>
Signed-off-by: Greg Kroah-Hartman <>
arch/powerpc/include/asm/hw_irq.h | 3 +++
1 file changed, 3 insertions(+)

--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -99,6 +99,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

 \ /
  Last update: 2012-06-20 21:22    [W:0.153 / U:27.760 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site