diff options
author | Aoi Shinkai <shinkoi2005@gmail.com> | 2008-12-09 23:30:28 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-12-22 04:44:02 -0500 |
commit | bd40e8132336fbc3f2857f24720e11b6c1c9ac26 (patch) | |
tree | 6eaccd510d76aff832b124d5f34b2b1023f1fcda | |
parent | 06be3724548a443a99d703ff79f43d6f1e2975f0 (diff) |
sh: Delete unnecessary mov in the interrupt exception entry point.
The INTEVT read at interrupt exception entry is uneccessary, as the read
is deferred until we are ready to enter do_IRQ(). The kgdb nmi path still
requires it, so move it there.
Signed-off-by: Aoi Shinkai <shinkoi2005@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 3fe482dd05c1..f112faa219c3 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S | |||
@@ -376,9 +376,9 @@ tlb_miss: | |||
376 | ! | 376 | ! |
377 | .balign 512,0,512 | 377 | .balign 512,0,512 |
378 | interrupt: | 378 | interrupt: |
379 | mov.l 2f, k2 | ||
380 | mov.l 3f, k3 | 379 | mov.l 3f, k3 |
381 | #if defined(CONFIG_KGDB_NMI) | 380 | #if defined(CONFIG_KGDB_NMI) |
381 | mov.l 2f, k2 | ||
382 | ! Debounce (filter nested NMI) | 382 | ! Debounce (filter nested NMI) |
383 | mov.l @k2, k0 | 383 | mov.l @k2, k0 |
384 | mov.l 5f, k1 | 384 | mov.l 5f, k1 |
@@ -390,6 +390,7 @@ interrupt: | |||
390 | rte | 390 | rte |
391 | nop | 391 | nop |
392 | .align 2 | 392 | .align 2 |
393 | 2: .long INTEVT | ||
393 | 5: .long NMI_VEC | 394 | 5: .long NMI_VEC |
394 | 6: .long in_nmi | 395 | 6: .long in_nmi |
395 | 0: | 396 | 0: |
@@ -399,7 +400,6 @@ interrupt: | |||
399 | 400 | ||
400 | .align 2 | 401 | .align 2 |
401 | 1: .long EXPEVT | 402 | 1: .long EXPEVT |
402 | 2: .long INTEVT | ||
403 | 3: .long ret_from_irq | 403 | 3: .long ret_from_irq |
404 | 4: .long ret_from_exception | 404 | 4: .long ret_from_exception |
405 | 405 | ||