Skip to content

Commit

Permalink
avr32: Build fix for CONFIG_BUG=n
Browse files Browse the repository at this point in the history
Don't include the BUG trap handling code when CONFIG_BUG is not set.
This fixes allnoconfig.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
  • Loading branch information
Haavard Skinnemoen committed Mar 13, 2008
1 parent bafe680 commit 957ecd7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions arch/avr32/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ static int do_cop_absent(u32 insn)
return 0;
}

#ifdef CONFIG_BUG
int is_valid_bugaddr(unsigned long pc)
{
unsigned short opcode;
Expand All @@ -189,6 +190,7 @@ int is_valid_bugaddr(unsigned long pc)

return opcode == AVR32_BUG_OPCODE;
}
#endif

asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs)
{
Expand All @@ -197,6 +199,7 @@ asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs)
void __user *pc;
long code;

#ifdef CONFIG_BUG
if (!user_mode(regs) && (ecr == ECR_ILLEGAL_OPCODE)) {
enum bug_trap_type type;

Expand All @@ -211,6 +214,7 @@ asmlinkage void do_illegal_opcode(unsigned long ecr, struct pt_regs *regs)
die("Kernel BUG", regs, SIGKILL);
}
}
#endif

local_irq_enable();

Expand Down

0 comments on commit 957ecd7

Please sign in to comment.