Merge branch 'fixes-2.6.39' into for-2.6.40

1 files changed, 58 insertions, 0 deletions

diff --git a/arch/m68k/kernel/irq.c b/arch/m68k/kernel/irq.c
new file mode 100644
index 00000000000..c7dd48f37be
--- /dev/null
+++ b/arch/m68k/kernel/irq.c
@@ -0,0 +1,58 @@
+/*
+ * irq.c
+ *
+ * (C) Copyright 2007, Greg Ungerer <gerg@snapgear.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/kernel_stat.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/seq_file.h>
+#include <asm/system.h>
+#include <asm/traps.h>
+
+asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
+{
+        struct pt_regs *oldregs = set_irq_regs(regs);
+
+        irq_enter();
+        generic_handle_irq(irq);
+        irq_exit();
+
+        set_irq_regs(oldregs);
+}
+
+int show_interrupts(struct seq_file *p, void *v)
+{
+        struct irqaction *ap;
+        int irq = *((loff_t *) v);
+
+        if (irq == 0)
+                seq_puts(p, "           CPU0\n");
+
+        if (irq < NR_IRQS) {
+                struct irq_desc *desc = irq_to_desc(irq);
+
+                ap = desc->action;
+                if (ap) {
+                        seq_printf(p, "%3d: ", irq);
+                        seq_printf(p, "%10u ", kstat_irqs(irq));
+                        seq_printf(p, "%14s  ", get_irq_desc_chip(desc)->name);
+
+                        seq_printf(p, "%s", ap->name);
+                        for (ap = ap->next; ap; ap = ap->next)
+                                seq_printf(p, ", %s", ap->name);
+                        seq_putc(p, '\n');
+                }
+        }
+
+        return 0;
+}
+