summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-16 00:28:20 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-16 00:28:20 (GMT)
commit1043e3becfbae0bee618f9b4f9598b145c4774e1 (patch)
treec2bd20373bc709cc00288fd8fd21dbece8d5247d
parent93dd048dbde493fb1eb11cdc844be5fa9cd1c925 (diff)
parentf948501b36c6b3d9352ce212a197098a7e958971 (diff)
downloadlinux-3.10-1043e3becfbae0bee618f9b4f9598b145c4774e1.zip
linux-3.10-1043e3becfbae0bee618f9b4f9598b145c4774e1.tar.gz
linux-3.10-1043e3becfbae0bee618f9b4f9598b145c4774e1.tar.bz2
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.h3
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 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