| commit | 5b0dac745f2e43836e8fb2920391834d8a8f7fed | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 09 16:25:02 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 09 16:25:02 2008 -0700 |
| tree | cff6014a4da1da7c0f4ebc50557bb178958be2c3 | |
| parent | bdce291a69a4de340eb5a0f7b87dd0d49744d6b6 [diff] | |
| parent | 2eb2f77900d62796934bcd43c4089e444cf1179e [diff] |
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().
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 9b6689d..2396388 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c
@@ -792,6 +792,8 @@ } spin_unlock_irqrestore(&irq_desc[irq].lock, flags); } + + tick_ops->disable_irq(); } #endif