diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-06-23 09:52:25 +0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-07-25 05:20:41 +0400 |
| commit | 622e9472dd723d5c7dc034510faae4b113e5bbc2 (patch) | |
| tree | 468728239c79b081a9e7739e627728462eb9579e /arch/m68k/platform/68328/ints.c | |
| parent | f4a5437333e405e967be660430e58fc2355c62c8 (diff) | |
| download | linux-622e9472dd723d5c7dc034510faae4b113e5bbc2.tar.xz | |
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/68328/ints.c')
| -rw-r--r-- | arch/m68k/platform/68328/ints.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/m68k/platform/68328/ints.c b/arch/m68k/platform/68328/ints.c index a90288cf7446..22acb60b541a 100644 --- a/arch/m68k/platform/68328/ints.c +++ b/arch/m68k/platform/68328/ints.c @@ -155,7 +155,7 @@ static struct irq_chip intc_irq_chip = { * This function should be called during kernel startup to initialize * the machine vector table. */ -void __init init_IRQ(void) +void __init trap_init(void) { int i; @@ -172,6 +172,11 @@ void __init init_IRQ(void) _ramvec[69] = (e_vector) inthandler5; _ramvec[70] = (e_vector) inthandler6; _ramvec[71] = (e_vector) inthandler7; +} + +void __init init_IRQ(void) +{ + int i; IVR = 0x40; /* Set DragonBall IVR (interrupt base) to 64 */ |