1 files changed, 30 insertions, 45 deletions

diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index c6345f579a8a..9b734d74ae8e 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -81,48 +81,9 @@ void ack_bad_irq(unsigned int irq)
 
 atomic_t irq_err_count;
 
-/*
- * Generic, controller-independent functions:
- */
-
-int show_interrupts(struct seq_file *p, void *v)
+int arch_show_interrupts(struct seq_file *p, int prec)
 {
-        int i = *(loff_t *) v, j;
-        struct irqaction * action;
-        unsigned long flags;
-
-        if (i == 0) {
-                seq_printf(p, "           ");
-                for_each_online_cpu(j)
-                        seq_printf(p, "CPU%d       ", j);
-                seq_putc(p, '\n');
-        }
-
-        if (i < NR_IRQS) {
-                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
-                action = irq_desc[i].action;
-                if (!action)
-                        goto skip;
-                seq_printf(p, "%3d: ", i);
-#ifndef CONFIG_SMP
-                seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-                for_each_online_cpu(j)
-                        seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-#endif
-                seq_printf(p, " %14s", irq_desc[i].chip->name);
-                seq_printf(p, "  %s", action->name);
-
-                for (action=action->next; action; action = action->next)
-                        seq_printf(p, ", %s", action->name);
-
-                seq_putc(p, '\n');
-skip:
-                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
-        } else if (i == NR_IRQS) {
-                seq_putc(p, '\n');
-                seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
-        }
+        seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
         return 0;
 }
 
@@ -141,7 +102,7 @@ void __init init_IRQ(void)
 #endif
 
         for (i = 0; i < NR_IRQS; i++)
-                set_irq_noprobe(i);
+                irq_set_noprobe(i);
 
         arch_init_irq();
 
@@ -151,6 +112,29 @@ void __init init_IRQ(void)
 #endif
 }
 
+#ifdef DEBUG_STACKOVERFLOW
+static inline void check_stack_overflow(void)
+{
+        unsigned long sp;
+
+        __asm__ __volatile__("move %0, $sp" : "=r" (sp));
+        sp &= THREAD_MASK;
+
+        /*
+         * Check for stack overflow: is there less than STACK_WARN free?
+         * STACK_WARN is defined as 1/8 of THREAD_SIZE by default.
+         */
+        if (unlikely(sp < (sizeof(struct thread_info) + STACK_WARN))) {
+                printk("do_IRQ: stack overflow: %ld\n",
+                       sp - sizeof(struct thread_info));
+                dump_stack();
+        }
+}
+#else
+static inline void check_stack_overflow(void) {}
+#endif
+
+
 /*
  * do_IRQ handles all normal device IRQ's (the special
  * SMP cross-CPU interrupts have their own specific
@@ -159,8 +143,9 @@ void __init init_IRQ(void)
 void __irq_entry do_IRQ(unsigned int irq)
 {
         irq_enter();
-        __DO_IRQ_SMTC_HOOK(irq);
-        generic_handle_irq(irq);
+        check_stack_overflow();
+        if (!smtc_handle_on_other_cpu(irq))
+                generic_handle_irq(irq);
         irq_exit();
 }
 
@@ -173,7 +158,7 @@ void __irq_entry do_IRQ(unsigned int irq)
 void __irq_entry do_IRQ_no_affinity(unsigned int irq)
 {
         irq_enter();
-        __NO_AFFINITY_IRQ_SMTC_HOOK(irq);
+        smtc_im_backstop(irq);
         generic_handle_irq(irq);
         irq_exit();
 }