diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2008-11-18 15:25:17 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-03-16 14:10:40 -0400 |
commit | f67080884a81f58cf95e25c284e30cbed21122a3 (patch) | |
tree | aae232a39dafc517b52101a9d4355f78e2d6ae53 /arch/m68k/kernel | |
parent | dcdf3a293522e6ef09d8b3650ac1ceec56438e5d (diff) |
m68k: Use base_trap_init() to initialize vectors
So basic initialization is all in one place.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/traps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index ada4f4cca811..cd802d49f7e9 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c | |||
@@ -48,10 +48,7 @@ asmlinkage void nmihandler(void); | |||
48 | asmlinkage void fpu_emu(void); | 48 | asmlinkage void fpu_emu(void); |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | e_vector vectors[256] = { | 51 | e_vector vectors[256]; |
52 | [VEC_BUSERR] = buserr, | ||
53 | [VEC_SYS] = system_call, | ||
54 | }; | ||
55 | 52 | ||
56 | /* nmi handler for the Amiga */ | 53 | /* nmi handler for the Amiga */ |
57 | asm(".text\n" | 54 | asm(".text\n" |
@@ -64,7 +61,7 @@ asm(".text\n" | |||
64 | */ | 61 | */ |
65 | void __init base_trap_init(void) | 62 | void __init base_trap_init(void) |
66 | { | 63 | { |
67 | if(MACH_IS_SUN3X) { | 64 | if (MACH_IS_SUN3X) { |
68 | extern e_vector *sun3x_prom_vbr; | 65 | extern e_vector *sun3x_prom_vbr; |
69 | 66 | ||
70 | __asm__ volatile ("movec %%vbr, %0" : "=r" (sun3x_prom_vbr)); | 67 | __asm__ volatile ("movec %%vbr, %0" : "=r" (sun3x_prom_vbr)); |
@@ -79,6 +76,9 @@ void __init base_trap_init(void) | |||
79 | 76 | ||
80 | vectors[VEC_UNIMPII] = unimp_vec; | 77 | vectors[VEC_UNIMPII] = unimp_vec; |
81 | } | 78 | } |
79 | |||
80 | vectors[VEC_BUSERR] = buserr; | ||
81 | vectors[VEC_SYS] = system_call; | ||
82 | } | 82 | } |
83 | 83 | ||
84 | void __init trap_init (void) | 84 | void __init trap_init (void) |