Commit f6708088 authored by Roman Zippel's avatar Roman Zippel Committed by Geert Uytterhoeven

m68k: Use base_trap_init() to initialize vectors

So basic initialization is all in one place.
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent dcdf3a29
...@@ -48,10 +48,7 @@ asmlinkage void nmihandler(void); ...@@ -48,10 +48,7 @@ asmlinkage void nmihandler(void);
asmlinkage void fpu_emu(void); asmlinkage void fpu_emu(void);
#endif #endif
e_vector vectors[256] = { e_vector vectors[256];
[VEC_BUSERR] = buserr,
[VEC_SYS] = system_call,
};
/* nmi handler for the Amiga */ /* nmi handler for the Amiga */
asm(".text\n" asm(".text\n"
...@@ -64,7 +61,7 @@ asm(".text\n" ...@@ -64,7 +61,7 @@ asm(".text\n"
*/ */
void __init base_trap_init(void) void __init base_trap_init(void)
{ {
if(MACH_IS_SUN3X) { if (MACH_IS_SUN3X) {
extern e_vector *sun3x_prom_vbr; extern e_vector *sun3x_prom_vbr;
__asm__ volatile ("movec %%vbr, %0" : "=r" (sun3x_prom_vbr)); __asm__ volatile ("movec %%vbr, %0" : "=r" (sun3x_prom_vbr));
...@@ -79,6 +76,9 @@ void __init base_trap_init(void) ...@@ -79,6 +76,9 @@ void __init base_trap_init(void)
vectors[VEC_UNIMPII] = unimp_vec; vectors[VEC_UNIMPII] = unimp_vec;
} }
vectors[VEC_BUSERR] = buserr;
vectors[VEC_SYS] = system_call;
} }
void __init trap_init (void) void __init trap_init (void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment