diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-18 20:12:00 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-18 20:12:00 -0400 |
| commit | ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f (patch) | |
| tree | e77b5ff0d17eb583312fe710de569081a3ec8f8d /arch/sh/kernel/cpu/sh3 | |
| parent | 1b3edd9745ef3a9ee831fe5a611757686579c9e1 (diff) | |
| parent | e174d13010a6bd52045466bc35ca5a86e3f3ba9b (diff) | |
Merge branch 'master' into sh/cachetlb
Conflicts:
arch/sh/kernel/Makefile_64
Diffstat (limited to 'arch/sh/kernel/cpu/sh3')
| -rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 854921c6f45..f94f25e666c 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S | |||
| @@ -516,6 +516,14 @@ ENTRY(handle_interrupt) | |||
| 516 | bsr save_regs ! needs original pr value in k3 | 516 | bsr save_regs ! needs original pr value in k3 |
| 517 | mov #-1, k2 ! default vector kept in k2 | 517 | mov #-1, k2 ! default vector kept in k2 |
| 518 | 518 | ||
| 519 | stc sr, r0 ! get status register | ||
| 520 | shlr2 r0 | ||
| 521 | and #0x3c, r0 | ||
| 522 | cmp/eq #0x3c, r0 | ||
| 523 | bf 9f | ||
| 524 | TRACE_IRQS_OFF | ||
| 525 | 9: | ||
| 526 | |||
| 519 | ! Setup return address and jump to do_IRQ | 527 | ! Setup return address and jump to do_IRQ |
| 520 | mov.l 4f, r9 ! fetch return address | 528 | mov.l 4f, r9 ! fetch return address |
| 521 | lds r9, pr ! put return address in pr | 529 | lds r9, pr ! put return address in pr |