diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-08 05:38:50 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 01:42:33 +0200 |
| commit | a3512b2dd57cb653bb33645ca9c934436e547e3c (patch) | |
| tree | 3aee652f6e24def006eebab958bb478512ae826d /arch/powerpc/kernel/exceptions-64s.S | |
| parent | powerpc/irq: Fix bug with new lazy IRQ handling code (diff) | |
| download | linux-a3512b2dd57cb653bb33645ca9c934436e547e3c.tar.xz linux-a3512b2dd57cb653bb33645ca9c934436e547e3c.zip | |
powerpc/irq: Make alignment & program interrupt behave the same
Alignment was the last user of the ENABLE_INTS macro, which we can
now remove. All non-syscall exceptions now disable interrupts on
entry, they get re-enabled conditionally from C code. Don't
unconditionally re-enable in program check either, check the
original context.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
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 cb705fdbb458..8f880bc77c56 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 |