Fixes (asm, entry, irq, linker, defconfig)

[mcf548x/linux.git] / arch / m68k / coldfire / ints.c

diff --git a/arch/m68k/coldfire/ints.c b/arch/m68k/coldfire/ints.c
index abadadc33f08b264fe454f7f397ace5c9fb50567..332a3247c7b226446a7cef662eaf93d891c4ab39 100644 (file)
--- a/arch/m68k/coldfire/ints.c
+++ b/arch/m68k/coldfire/ints.c
@@ -96,24 +96,32 @@ void __init init_IRQ(void)
 #endif
 }
 
+unsigned int irq_canonicalize(unsigned int irq)
+{
+       return irq;
+}
+
+EXPORT_SYMBOL(irq_canonicalize);
+
+
 /*
- * process_int(unsigned long vec, struct pt_regs *fp)
+ * __m68k_handle_int(unsigned long vec, struct pt_regs *fp)
  *
  * Process an interrupt.  Called from entry.S.
  */
-asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
+asmlinkage void __m68k_handle_int(unsigned int irq, struct pt_regs *regs)
 {
        struct pt_regs *old_regs;
        struct irq_node *node;
-       old_regs = set_irq_regs(fp);
-       kstat_cpu(0).irqs[vec]++;
+       old_regs = set_irq_regs(regs);
+       kstat_cpu(0).irqs[irq]++;
 
-       node = irq_list[vec];
+       node = irq_list[irq];
        if (!node)
-               handle_badint(fp);
+               handle_badint(regs);
        else {
                do {
-                       node->handler(vec, node->dev_id);
+                       node->handler(irq, node->dev_id);
                        node = node->next;
                } while (node);
        }