diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2008-11-18 21:25:17 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-03-16 19:10:40 +0100 |
| commit | f67080884a81f58cf95e25c284e30cbed21122a3 (patch) | |
| tree | aae232a39dafc517b52101a9d4355f78e2d6ae53 | |
| parent | dcdf3a293522e6ef09d8b3650ac1ceec56438e5d (diff) | |
| download | linux-stable-f67080884a81f58cf95e25c284e30cbed21122a3.tar.gz linux-stable-f67080884a81f58cf95e25c284e30cbed21122a3.tar.bz2 linux-stable-f67080884a81f58cf95e25c284e30cbed21122a3.zip | |
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>
| -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); asmlinkage void fpu_emu(void); #endif -e_vector vectors[256] = { - [VEC_BUSERR] = buserr, - [VEC_SYS] = system_call, -}; +e_vector vectors[256]; /* nmi handler for the Amiga */ asm(".text\n" @@ -64,7 +61,7 @@ asm(".text\n" */ void __init base_trap_init(void) { - if(MACH_IS_SUN3X) { + if (MACH_IS_SUN3X) { extern e_vector *sun3x_prom_vbr; __asm__ volatile ("movec %%vbr, %0" : "=r" (sun3x_prom_vbr)); @@ -79,6 +76,9 @@ void __init base_trap_init(void) vectors[VEC_UNIMPII] = unimp_vec; } + + vectors[VEC_BUSERR] = buserr; + vectors[VEC_SYS] = system_call; } void __init trap_init (void) |