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/kernel/traps_no.c | |
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/kernel/traps_no.c')
-rw-r--r-- | arch/m68k/kernel/traps_no.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/kernel/traps_no.c b/arch/m68k/kernel/traps_no.c index a768008dfd06..e67b8c806959 100644 --- a/arch/m68k/kernel/traps_no.c +++ b/arch/m68k/kernel/traps_no.c | |||
@@ -60,10 +60,6 @@ static char const * const vec_names[] = { | |||
60 | "MMU CONFIGURATION ERROR" | 60 | "MMU CONFIGURATION ERROR" |
61 | }; | 61 | }; |
62 | 62 | ||
63 | void __init trap_init(void) | ||
64 | { | ||
65 | } | ||
66 | |||
67 | void die_if_kernel(char *str, struct pt_regs *fp, int nr) | 63 | void die_if_kernel(char *str, struct pt_regs *fp, int nr) |
68 | { | 64 | { |
69 | if (!(fp->sr & PS_S)) | 65 | if (!(fp->sr & PS_S)) |