From: Aoi Shinkai <shinkoi2005@gmail.com>
Date: Wed, 10 Dec 2008 04:30:28 +0000 (+0900)
Subject: sh: Delete unnecessary mov in the interrupt exception entry point.
X-Git-Tag: v2.6.29-rc1~591^2~63
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bd40e8132336fbc3f2857f24720e11b6c1c9ac26;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index 3fe482dd05c..f112faa219c 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -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