]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sh: Delete unnecessary mov in the interrupt exception entry point.
authorAoi Shinkai <shinkoi2005@gmail.com>
Wed, 10 Dec 2008 04:30:28 +0000 (13:30 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 22 Dec 2008 09:44:02 +0000 (18:44 +0900)
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>
arch/sh/kernel/cpu/sh3/entry.S

index 3fe482dd05c164a3b7cce794f17833e115b4af44..f112faa219c372beb7f6b0f533165d2d77a1811e 100644 (file)
@@ -376,9 +376,9 @@ tlb_miss:
 !
        .balign         512,0,512
 interrupt:
-       mov.l   2f, k2
        mov.l   3f, k3
 #if defined(CONFIG_KGDB_NMI)
+       mov.l   2f, k2
        ! Debounce (filter nested NMI)
        mov.l   @k2, k0
        mov.l   5f, k1
@@ -390,6 +390,7 @@ interrupt:
        rte
         nop
        .align  2
+2:     .long   INTEVT
 5:     .long   NMI_VEC
 6:     .long   in_nmi
 0:
@@ -399,7 +400,6 @@ interrupt:
 
        .align  2
 1:     .long   EXPEVT
-2:     .long   INTEVT
 3:     .long   ret_from_irq
 4:     .long   ret_from_exception