diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-08 15:47:12 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-08 15:47:12 +0900 |
| commit | 6424db52e24e8cdf89917fa3c10395116440160e (patch) | |
| tree | bd923d78f90addb080abc82f3bff6ca5c9bf10b4 /arch/sh/include/asm/system.h | |
| parent | 09a072947791088b88ae15111cf68fc5aaaf758d (diff) | |
| parent | 6a5a0b9139b19dd1a107870269a35bc9cf18d2dc (diff) | |
| download | talos-obmc-linux-6424db52e24e8cdf89917fa3c10395116440160e.tar.gz talos-obmc-linux-6424db52e24e8cdf89917fa3c10395116440160e.zip | |
Merge branch 'master' into sh/hw-breakpoints
Conflict between FPU thread flag migration and debug
thread flag addition.
Conflicts:
arch/sh/include/asm/thread_info.h
arch/sh/include/asm/ubc.h
arch/sh/kernel/process_32.c
Diffstat (limited to 'arch/sh/include/asm/system.h')
| -rw-r--r-- | arch/sh/include/asm/system.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h index 1014da8b3ed3..91b173fd37a6 100644 --- a/arch/sh/include/asm/system.h +++ b/arch/sh/include/asm/system.h @@ -169,10 +169,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 { |
