diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-06-04 03:39:50 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-04 03:39:50 +0200 |
| commit | c596b1a38085a041464b9b2c0c200e81ff695634 (patch) | |
| tree | a6f08355b114d7e5812950ff4741d45ea45f0083 /arch | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-c596b1a38085a041464b9b2c0c200e81ff695634.tar.xz linux-c596b1a38085a041464b9b2c0c200e81ff695634.zip | |
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')
| -rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 2 |
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 659cc081e5e7..b0b59d4a33ca 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 |