diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-17 15:16:46 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-17 15:16:46 +0100 |
| commit | 275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch) | |
| tree | df906ef901d7719d66944921c7436f5db718dc2f /arch/sparc/kernel/leon_kernel.c | |
| parent | 909ea96468096b07fbb41aaf69be060d92bd9271 (diff) | |
| parent | 8f1d97c79eb65de1d05799d6b81d79cd94169114 (diff) | |
| download | talos-op-linux-275c8b93288ef0c2281e414e069ea8ed4bad03f7.tar.gz talos-op-linux-275c8b93288ef0c2281e414e069ea8ed4bad03f7.zip | |
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'arch/sparc/kernel/leon_kernel.c')
| -rw-r--r-- | arch/sparc/kernel/leon_kernel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c index 2d51527d810f..f01c42661ee5 100644 --- a/arch/sparc/kernel/leon_kernel.c +++ b/arch/sparc/kernel/leon_kernel.c @@ -114,7 +114,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) if (leon3_gptimer_regs && leon3_irqctrl_regs) { LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0); LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld, - (((1000000 / 100) - 1))); + (((1000000 / HZ) - 1))); LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0); #ifdef CONFIG_SMP @@ -128,7 +128,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) } LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0); - LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/100) - 1))); + LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/HZ) - 1))); LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0); # endif |
