diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 06:54:14 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 06:54:14 +0200 |
| commit | ac6a0cf6716bb46813d0161024c66c2af66e53d1 (patch) | |
| tree | c7f53b1a04c590032c022549f3186fb9b04f8358 /arch/sh/include/asm/system.h | |
| parent | sh: Fix up sh4_flush_dcache_page() build on UP. (diff) | |
| parent | sh: Fix dcache flushing for N-way write-through caches. (diff) | |
| download | linux-ac6a0cf6716bb46813d0161024c66c2af66e53d1.tar.xz linux-ac6a0cf6716bb46813d0161024c66c2af66e53d1.zip | |
Merge branch 'master' into sh/smp
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'arch/sh/include/asm/system.h')
| -rw-r--r-- | arch/sh/include/asm/system.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h index bf7c4cbde372..6b272238a46e 100644 --- a/arch/sh/include/asm/system.h +++ b/arch/sh/include/asm/system.h @@ -169,6 +169,11 @@ BUILD_TRAP_HANDLER(breakpoint); BUILD_TRAP_HANDLER(singlestep); BUILD_TRAP_HANDLER(fpu_error); BUILD_TRAP_HANDLER(fpu_state_restore); +BUILD_TRAP_HANDLER(unwinder); + +#ifdef CONFIG_BUG +extern void handle_BUG(struct pt_regs *); +#endif #define arch_align_stack(x) (x) |