aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 16:25:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 16:25:02 -0700
commit5b0dac745f2e43836e8fb2920391834d8a8f7fed (patch)
treecff6014a4da1da7c0f4ebc50557bb178958be2c3
parentbdce291a69a4de340eb5a0f7b87dd0d49744d6b6 (diff)
parent2eb2f77900d62796934bcd43c4089e444cf1179e (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().
-rw-r--r--arch/sparc64/kernel/irq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 9b6689d9d570..23963882bc18 100644
--- 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

Privacy Policy