diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 20:28:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 20:28:20 -0400 |
| commit | 1043e3becfbae0bee618f9b4f9598b145c4774e1 (patch) | |
| tree | c2bd20373bc709cc00288fd8fd21dbece8d5247d | |
| parent | 93dd048dbde493fb1eb11cdc844be5fa9cd1c925 (diff) | |
| parent | f948501b36c6b3d9352ce212a197098a7e958971 (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Pull PowerPC fix from Paul Mackerras:
"Just one commit, and a one-liner at that, but an important one;
without it hard_irq_disable() does nothing on powerpc."
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
Make hard_irq_disable() actually hard-disable interrupts
| -rw-r--r-- | arch/powerpc/include/asm/hw_irq.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index c9aac24b02e2..32b394f3b854 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) | |||
| 100 | get_paca()->irq_happened |= PACA_IRQ_HARD_DIS; | 100 | get_paca()->irq_happened |= PACA_IRQ_HARD_DIS; |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | /* include/linux/interrupt.h needs hard_irq_disable to be a macro */ | ||
| 104 | #define hard_irq_disable hard_irq_disable | ||
| 105 | |||
| 103 | /* | 106 | /* |
| 104 | * This is called by asynchronous interrupts to conditionally | 107 | * This is called by asynchronous interrupts to conditionally |
| 105 | * re-enable hard interrupts when soft-disabled after having | 108 | * re-enable hard interrupts when soft-disabled after having |