diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-22 05:37:14 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-22 05:37:14 +0900 |
| commit | fa9d3b4da55fc8949efc2b4220d93f188fbcebd6 (patch) | |
| tree | ead3e046b7e6e101d1d27db36116c52405d43c36 /arch/sh/kernel/cpu/sh3 | |
| parent | c01f0f1a4a96eb3acc5850e18cc43f24366966d0 (diff) | |
| parent | 74db2479c1fecefd0a190f282f28f00565309807 (diff) | |
| download | op-kernel-dev-fa9d3b4da55fc8949efc2b4220d93f188fbcebd6.zip op-kernel-dev-fa9d3b4da55fc8949efc2b4220d93f188fbcebd6.tar.gz | |
Merge branch 'sh/dwarf-unwinder'
Conflicts:
arch/sh/kernel/cpu/sh3/entry.S
Diffstat (limited to 'arch/sh/kernel/cpu/sh3')
| -rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 272636e..8c19e21 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S @@ -508,6 +508,8 @@ ENTRY(handle_interrupt) bsr save_regs ! needs original pr value in k3 mov #-1, k2 ! default vector kept in k2 + setup_frame_reg + stc sr, r0 ! get status register shlr2 r0 and #0x3c, r0 |
