diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-27 02:00:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-27 02:00:38 +0100 |
| commit | c75d5c5d82146636560ad5b91f3544ae60fc1c57 (patch) | |
| tree | 2ceb03ac95dd3f7889a2d45d72f9342e52fa7583 | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | sparc32: forced setting of mode of sun4m per-cpu timers (diff) | |
| download | linux-c75d5c5d82146636560ad5b91f3544ae60fc1c57.tar.xz linux-c75d5c5d82146636560ad5b91f3544ae60fc1c57.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc32: forced setting of mode of sun4m per-cpu timers
| -rw-r--r-- | arch/sparc/kernel/sun4m_irq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index 422c16dad1f6..e61165161dd3 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c @@ -399,6 +399,9 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn) timers_global = (void __iomem *) (unsigned long) addr[num_cpu_timers]; + /* Every per-cpu timer works in timer mode */ + sbus_writel(0x00000000, &timers_global->timer_config); + sbus_writel((((1000000/HZ) + 1) << 10), &timers_global->l10_limit); master_l10_counter = &timers_global->l10_count; |