lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-06-15 17:28:20 -07:00
parent 93dd048dbd f948501b36
commit 1043e3becf
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/include/asm/hw_irq.h
View File

@@ -100,6 +100,9 @@ static inline void hard_irq_disable(void)
get_paca()->irq_happened |= PACA_IRQ_HARD_DIS; 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 * This is called by asynchronous interrupts to conditionally
* re-enable hard interrupts when soft-disabled after having * re-enable hard interrupts when soft-disabled after having