AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

sh64: Fix up the CONFIG_GENERIC_BUG=n build.

Browse Source 
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>
This commit is contained in:
Paul Mundt 2009-11-12 16:39:47 +09:00
parent e9c58fc57b
commit 626ac8e138
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/include/asm/system.h
View File

@ -171,10 +171,6 @@ BUILD_TRAP_HANDLER(fpu_error);
BUILD_TRAP_HANDLER(fpu_state_restore); BUILD_TRAP_HANDLER(fpu_state_restore);
BUILD_TRAP_HANDLER(nmi); BUILD_TRAP_HANDLER(nmi);
#ifdef CONFIG_BUG
extern void handle_BUG(struct pt_regs *);
#endif
#define arch_align_stack(x) (x) #define arch_align_stack(x) (x)
struct mem_access { struct mem_access {

6
arch/sh/kernel/traps.c
View File

@ -9,8 +9,8 @@
#include <asm/unwinder.h> #include <asm/unwinder.h>
#include <asm/system.h> #include <asm/system.h>
#ifdef CONFIG_BUG #ifdef CONFIG_GENERIC_BUG
void handle_BUG(struct pt_regs *regs) static void handle_BUG(struct pt_regs *regs)
{ {
const struct bug_entry *bug; const struct bug_entry *bug;
unsigned long bugaddr = regs->pc; unsigned long bugaddr = regs->pc;
@ -81,7 +81,7 @@ BUILD_TRAP_HANDLER(bug)
SIGTRAP) == NOTIFY_STOP) SIGTRAP) == NOTIFY_STOP)
return; return;
#ifdef CONFIG_BUG #ifdef CONFIG_GENERIC_BUG
if (__kernel_text_address(instruction_pointer(regs))) { if (__kernel_text_address(instruction_pointer(regs))) {
insn_size_t insn = *(insn_size_t *)instruction_pointer(regs); insn_size_t insn = *(insn_size_t *)instruction_pointer(regs);
if (insn == TRAPA_BUG_OPCODE) if (insn == TRAPA_BUG_OPCODE)