diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 19:25:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 19:25:02 -0400 |
| commit | 5b0dac745f2e43836e8fb2920391834d8a8f7fed (patch) | |
| 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().
| -rw-r--r-- | arch/sparc64/kernel/irq.c | 2 |
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) | |||
| 792 | } | 792 | } |
| 793 | spin_unlock_irqrestore(&irq_desc[irq].lock, flags); | 793 | spin_unlock_irqrestore(&irq_desc[irq].lock, flags); |
| 794 | } | 794 | } |
| 795 | |||
| 796 | tick_ops->disable_irq(); | ||
| 795 | } | 797 | } |
| 796 | #endif | 798 | #endif |
| 797 | 799 | ||