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>

diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index ada4f4cca811b6ea14e0406619d8d7181ae60b77..cd802d49f7e909dd8e15e89676a6bf78dec291b3 100644 (file)
--- 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)