aboutsummaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-06-04 10:39:50 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-06-04 10:39:50 +0900
commitc596b1a38085a041464b9b2c0c200e81ff695634 (patch)
treea6f08355b114d7e5812950ff4741d45ea45f0083 /arch/sh
parentc1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0 (diff)
downloadlinux-2.6.34-ux500-c596b1a38085a041464b9b2c0c200e81ff695634.tar.gz
sh: Fix in_nmi symbol build error.
If CONFIG_KGDB_NMI is disabled, we're left with a stray in_nmi reference that can't be resolved. Move the symbol under the ifdef, too. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/sh3/entry.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index 659cc081e5e..b0b59d4a33c 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -320,7 +320,9 @@ skip_restore:
.align 2
5: .long 0x00001000 ! DSP
+#ifdef CONFIG_KGDB_NMI
6: .long in_nmi
+#endif
7: .long 0x30000000
! common exception handler