diff options
author | Greg Ungerer | 2011-06-23 07:52:25 +0200 |
---|---|---|
committer | Greg Ungerer | 2011-07-25 03:20:41 +0200 |
commit | 622e9472dd723d5c7dc034510faae4b113e5bbc2 (patch) | |
tree | 468728239c79b081a9e7739e627728462eb9579e /arch/m68k/platform/coldfire/vectors.c | |
parent | m68knommu: merge ColdFire 5206 and 5206e platform code (diff) | |
download | kernel-qcow2-linux-622e9472dd723d5c7dc034510faae4b113e5bbc2.tar.gz kernel-qcow2-linux-622e9472dd723d5c7dc034510faae4b113e5bbc2.tar.xz kernel-qcow2-linux-622e9472dd723d5c7dc034510faae4b113e5bbc2.zip |
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/platform/coldfire/vectors.c')
-rw-r--r-- | arch/m68k/platform/coldfire/vectors.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/m68k/platform/coldfire/vectors.c b/arch/m68k/platform/coldfire/vectors.c index a21d3f870b7a..3a7cc524ecd3 100644 --- a/arch/m68k/platform/coldfire/vectors.c +++ b/arch/m68k/platform/coldfire/vectors.c @@ -35,21 +35,13 @@ asmlinkage void dbginterrupt_c(struct frame *fp) extern e_vector *_ramvec; -void set_evector(int vecnum, void (*handler)(void)) -{ - if (vecnum >= 0 && vecnum <= 255) - _ramvec[vecnum] = handler; -} - -/***************************************************************************/ - /* Assembler routines */ asmlinkage void buserr(void); asmlinkage void trap(void); asmlinkage void system_call(void); asmlinkage void inthandler(void); -void __init init_vectors(void) +void __init trap_init(void) { int i; |