diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-09 18:07:29 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-09 18:07:29 (GMT) |
| commit | 6a5beacca8681fb6602649dd8cf5ba50a90befb3 (patch) | |
| tree | 2c440c3d4d9ed62f06a5eceda0a2b20f2d773307 /arch/powerpc/kernel/exceptions-64s.S | |
| parent | 1eef1600af5f7404505f217513946e04c6b95718 (diff) | |
| parent | a3512b2dd57cb653bb33645ca9c934436e547e3c (diff) | |
| download | linux-fsl-qoriq-6a5beacca8681fb6602649dd8cf5ba50a90befb3.tar.xz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"Here are a couple of last minute fixes for 3.4 for regressions
introduced by my rewrite of the lazy irq masking code."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/irq: Make alignment & program interrupt behave the same
powerpc/irq: Fix bug with new lazy IRQ handling code
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index cb705fd..8f880bc 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -768,8 +768,8 @@ alignment_common: std r3,_DAR(r1) std r4,_DSISR(r1) bl .save_nvgprs + DISABLE_INTS addi r3,r1,STACK_FRAME_OVERHEAD - ENABLE_INTS bl .alignment_exception b .ret_from_except |