diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 02:57:57 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 02:57:57 +0200 |
| commit | ea4e89afedc7fc64078076eacbcffaaa742baf0d (patch) | |
| tree | 1e4a14dd1ada2eff8d1cb4d76bf9e337e079845e /arch/powerpc/kernel/exceptions-64s.S | |
| parent | powerpc/windfarm: don't pass const strings to snprintf (diff) | |
| parent | powerpc/irq: Make alignment & program interrupt behave the same (diff) | |
| download | linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.tar.xz linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.zip | |
Merge branch 'merge' into next
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 e0537693d660..f7bed44ee165 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -764,8 +764,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 |