From 3ae538a3965184b0e7df490ab137727e5e3fb6bf Mon Sep 17 00:00:00 2001
From: Aoi Shinkai <shinkoi2005@gmail.com>
Date: Wed, 10 Dec 2008 13:30:28 +0900
Subject: [PATCH] --- yaml --- r: 120104 b: refs/heads/master c:
 bd40e8132336fbc3f2857f24720e11b6c1c9ac26 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/sh/kernel/cpu/sh3/entry.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 432bc893df0f..c5f75c2b89a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06be3724548a443a99d703ff79f43d6f1e2975f0
+refs/heads/master: bd40e8132336fbc3f2857f24720e11b6c1c9ac26
diff --git a/trunk/arch/sh/kernel/cpu/sh3/entry.S b/trunk/arch/sh/kernel/cpu/sh3/entry.S
index 3fe482dd05c1..f112faa219c3 100644
--- a/trunk/arch/sh/kernel/cpu/sh3/entry.S
+++ b/trunk/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