diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-12 16:39:47 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-12 16:39:47 +0900 |
| commit | 626ac8e1388ac128495a3b7188e9d86464de6c5b (patch) | |
| tree | b65cd71841e646064f4e12f82b53d3a2dc0b9698 /arch/sh | |
| parent | e9c58fc57b17bfa75c256fb4f45ce22de6626858 (diff) | |
| download | linux-626ac8e1388ac128495a3b7188e9d86464de6c5b.tar.bz2 | |
sh64: Fix up the CONFIG_GENERIC_BUG=n build.
sh64 doesn't use GENERIC_BUG, which presently causes the handle_BUG()
code to blow up. Fix up the dependencies and get it all building again.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/system.h | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/traps.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h index b5c5acdc8c0e..c15415b4b169 100644 --- a/arch/sh/include/asm/system.h +++ b/arch/sh/include/asm/system.h @@ -171,10 +171,6 @@ BUILD_TRAP_HANDLER(fpu_error); BUILD_TRAP_HANDLER(fpu_state_restore); BUILD_TRAP_HANDLER(nmi); -#ifdef CONFIG_BUG -extern void handle_BUG(struct pt_regs *); -#endif - #define arch_align_stack(x) (x) struct mem_access { diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index d52695df2702..7b036339dc92 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -9,8 +9,8 @@ #include <asm/unwinder.h> #include <asm/system.h> -#ifdef CONFIG_BUG -void handle_BUG(struct pt_regs *regs) +#ifdef CONFIG_GENERIC_BUG +static void handle_BUG(struct pt_regs *regs) { const struct bug_entry *bug; unsigned long bugaddr = regs->pc; @@ -81,7 +81,7 @@ BUILD_TRAP_HANDLER(bug) SIGTRAP) == NOTIFY_STOP) return; -#ifdef CONFIG_BUG +#ifdef CONFIG_GENERIC_BUG if (__kernel_text_address(instruction_pointer(regs))) { insn_size_t insn = *(insn_size_t *)instruction_pointer(regs); if (insn == TRAPA_BUG_OPCODE) |