SPIN_LOCK_UNLOCKED cleanup in arch/m68k
[linux-2.6.git] / arch / m68k / sun3 / sun3ints.c
index baf74e8..50df34b 100644 (file)
@@ -90,7 +90,7 @@ static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)
 
 static struct irq_controller sun3_irq_controller = {
        .name           = "sun3",
-       .lock           = SPIN_LOCK_UNLOCKED,
+       .lock           = __SPIN_LOCK_UNLOCKED(sun3_irq_controller.lock),
        .startup        = m68k_irq_startup,
        .shutdown       = m68k_irq_shutdown,
        .enable         = sun3_enable_irq,
@@ -103,7 +103,7 @@ void sun3_init_IRQ(void)
 
        m68k_setup_auto_interrupt(sun3_inthandle);
        m68k_setup_irq_controller(&sun3_irq_controller, IRQ_AUTO_1, 7);
-       m68k_setup_user_interrupt(VEC_USER, 192, NULL);
+       m68k_setup_user_interrupt(VEC_USER, 128, NULL);
 
        request_irq(IRQ_AUTO_5, sun3_int5, 0, "int5", NULL);
        request_irq(IRQ_AUTO_7, sun3_int7, 0, "int7", NULL);