diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-06-23 15:52:25 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-07-25 11:20:41 +1000 |
| commit | 622e9472dd723d5c7dc034510faae4b113e5bbc2 (patch) | |
| tree | 468728239c79b081a9e7739e627728462eb9579e /arch/m68k/platform/68360/ints.c | |
| parent | f4a5437333e405e967be660430e58fc2355c62c8 (diff) | |
| download | linux-622e9472dd723d5c7dc034510faae4b113e5bbc2.tar.bz2 | |
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/68360/ints.c')
| -rw-r--r-- | arch/m68k/platform/68360/ints.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/m68k/platform/68360/ints.c b/arch/m68k/platform/68360/ints.c index 4af0f4e30f74..44443820d208 100644 --- a/arch/m68k/platform/68360/ints.c +++ b/arch/m68k/platform/68360/ints.c @@ -63,9 +63,8 @@ static struct irq_chip intc_irq_chip = { * This function should be called during kernel startup to initialize * the vector table. */ -void init_IRQ(void) +void __init trap_init(void) { - int i; int vba = (CPM_VECTOR_BASE<<4); /* set up the vectors */ @@ -130,6 +129,11 @@ void init_IRQ(void) /* turn off all CPM interrupts */ pquicc->intr_cimr = 0x00000000; +} + +void init_IRQ(void) +{ + int i; for (i = 0; (i < NR_IRQS); i++) { irq_set_chip(i, &intc_irq_chip); |