Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Disable timer interrupts in fixup_irqs().
DX37 · Sep 9, 2008 · 5b0dac7 · 5b0dac7
2 parents bdce291 + 2eb2f77
commit 5b0dac7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
@@ -792,6 +792,8 @@ void fixup_irqs(void)
 		}
 		spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
 	}
+
+	tick_ops->disable_irq();
 }
 #endif