Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't

have a MIPS box at hand.

1 files changed, 9 insertions, 1 deletions

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index e1a53ab57..d53f7ffea 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -192,7 +192,7 @@ unmask_irq(unsigned long irq)
 }
 
 void
-disable_irq(unsigned int irq_nr)
+disable_irq_nosync(unsigned int irq_nr)
 {
 	unsigned long flags;
 
@@ -202,6 +202,14 @@ disable_irq(unsigned int irq_nr)
 }
 
 void
+disable_irq(unsigned int irq_nr)
+{
+	/* This works non-SMP, and SMP until we write code to distribute
+	   interrupts to more that cpu 0.  */
+	disable_irq_nosync(irq_nr);
+}
+
+void
 enable_irq(unsigned int irq_nr)
 {
 	unsigned long flags;