diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 12:47:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 12:47:47 -0400 |
| commit | 33d444f182a1757640077c6b7381e54c13142b1d (patch) | |
| tree | 106bf7bdd645c2efd645ff3973fcfd64d41cfce8 /arch/sparc/kernel/sun4m_irq.c | |
| parent | ae7d5c8622a518601a21f14de5c70de5f1c967bf (diff) | |
| parent | 8354c5b72636e5321e9b16dae1da1445506f6af6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Wire up signalfd/timerfd/eventfd syscalls.
[SPARC64]: Add support for bq4802 TOD chip, as found on ultra45.
[SPARC64]: Correct FIRE_IOMMU_FLUSHINV register offset.
[SPARC64]: envctrl.c needs asm/io.h
[SPARC64]: Update defconfig.
[TTY]: Export proc_clear_tty() to modulea.
[SPARC64]: pci_resource_adjust() cannot be __init.
[SPARC64]: Spelling fixes.
[SPARC]: Spelling fixes.
[SPARC64]: Kill LARGE_ALLOCS and update defconfig.
Diffstat (limited to 'arch/sparc/kernel/sun4m_irq.c')
| -rw-r--r-- | arch/sparc/kernel/sun4m_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index a654c16f4027..91a803ea88be 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c | |||
| @@ -299,7 +299,7 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn) | |||
| 299 | struct tt_entry *trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)]; | 299 | struct tt_entry *trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)]; |
| 300 | 300 | ||
| 301 | /* For SMP we use the level 14 ticker, however the bootup code | 301 | /* For SMP we use the level 14 ticker, however the bootup code |
| 302 | * has copied the firmwares level 14 vector into boot cpu's | 302 | * has copied the firmware's level 14 vector into the boot cpu's |
| 303 | * trap table, we must fix this now or we get squashed. | 303 | * trap table, we must fix this now or we get squashed. |
| 304 | */ | 304 | */ |
| 305 | local_irq_save(flags); | 305 | local_irq_save(flags); |