diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-08 20:57:57 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-08 20:57:57 -0400 |
| commit | ea4e89afedc7fc64078076eacbcffaaa742baf0d (patch) | |
| tree | 1e4a14dd1ada2eff8d1cb4d76bf9e337e079845e /arch/powerpc/kernel/exceptions-64s.S | |
| parent | 43671cc96e58458b2711f1e97ff24a4c0e7cd1ac (diff) | |
| parent | a3512b2dd57cb653bb33645ca9c934436e547e3c (diff) | |
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: | |||
| 764 | std r3,_DAR(r1) | 764 | std r3,_DAR(r1) |
| 765 | std r4,_DSISR(r1) | 765 | std r4,_DSISR(r1) |
| 766 | bl .save_nvgprs | 766 | bl .save_nvgprs |
| 767 | DISABLE_INTS | ||
| 767 | addi r3,r1,STACK_FRAME_OVERHEAD | 768 | addi r3,r1,STACK_FRAME_OVERHEAD |
| 768 | ENABLE_INTS | ||
| 769 | bl .alignment_exception | 769 | bl .alignment_exception |
| 770 | b .ret_from_except | 770 | b .ret_from_except |
| 771 | 771 | ||