diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-06-23 01:52:25 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-07-24 21:20:41 -0400 |
commit | 622e9472dd723d5c7dc034510faae4b113e5bbc2 (patch) | |
tree | 468728239c79b081a9e7739e627728462eb9579e /arch/m68k/include/asm/traps.h | |
parent | f4a5437333e405e967be660430e58fc2355c62c8 (diff) |
m68knommu: correctly use trap_init
Currently trap_init() is an empty function for m68knommu. Instead
the vectors are being setup as part of the IRQ initialization.
This is inconsistent with m68k and other architectures.
Change the local init_vectors() to be trap_init(), and init the
vectors at the correct time during startup. This will help merge of
m68k and m68knommu trap code in the furture.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/traps.h')
-rw-r--r-- | arch/m68k/include/asm/traps.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/traps.h b/arch/m68k/include/asm/traps.h index 0bffb17d5db..151068f64f4 100644 --- a/arch/m68k/include/asm/traps.h +++ b/arch/m68k/include/asm/traps.h | |||
@@ -22,7 +22,6 @@ extern e_vector vectors[]; | |||
22 | asmlinkage void auto_inthandler(void); | 22 | asmlinkage void auto_inthandler(void); |
23 | asmlinkage void user_inthandler(void); | 23 | asmlinkage void user_inthandler(void); |
24 | asmlinkage void bad_inthandler(void); | 24 | asmlinkage void bad_inthandler(void); |
25 | extern void init_vectors(void); | ||
26 | 25 | ||
27 | #endif | 26 | #endif |
28 | 27 | ||