diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-18 18:35:20 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-18 18:35:20 +0900 |
| commit | 77f36fcc035a5af19e95f50a2e648cda2a6ef2b9 (patch) | |
| tree | a183a3289807a83da9c11e0d2d722cec60fce5d9 /arch/sh/kernel/traps_32.c | |
| parent | 838a4a9dcee0cbaeb0943531da00ac44d578f315 (diff) | |
| parent | d01447b3197c2c470a14666be2c640407bbbfec7 (diff) | |
Merge branch 'sh/pmb-dynamic'
Diffstat (limited to 'arch/sh/kernel/traps_32.c')
| -rw-r--r-- | arch/sh/kernel/traps_32.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c index 9c090cb6887..c3d86fa71dd 100644 --- a/arch/sh/kernel/traps_32.c +++ b/arch/sh/kernel/traps_32.c @@ -30,7 +30,6 @@ #include <asm/alignment.h> #include <asm/fpu.h> #include <asm/kprobes.h> -#include <asm/sh_bios.h> #ifdef CONFIG_CPU_SH2 # define TRAP_RESERVED_INST 4 @@ -848,12 +847,6 @@ void __init trap_init(void) #ifdef TRAP_UBC set_exception_table_vec(TRAP_UBC, breakpoint_trap_handler); #endif - - /* Save off the BIOS VBR, if there is one */ - sh_bios_vbr_init(); - - /* Setup VBR for boot cpu */ - per_cpu_trap_init(); } void show_stack(struct task_struct *tsk, unsigned long *sp) |