summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz2010-04-27 05:24:37 +0200
committerJohn Stultz2011-02-21 22:33:49 +0100
commit39280742efb00ab61ad62486c737fdd3e980c30f (patch)
tree0f37beb64c935af8bf940cf0719601dce79eb3e4
parentalpha: convert to clocksource_register_hz (diff)
downloadkernel-qcow2-linux-39280742efb00ab61ad62486c737fdd3e980c30f.tar.gz
kernel-qcow2-linux-39280742efb00ab61ad62486c737fdd3e980c30f.tar.xz
kernel-qcow2-linux-39280742efb00ab61ad62486c737fdd3e980c30f.zip
sparc: convert to clocksource_register_hz/khz
This converts the sparc clocksources to use clocksource_register_hz/khz CC: "David S. Miller" <davem@davemloft.net> CC: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <johnstul@us.ibm.com>
-rw-r--r--arch/sparc/kernel/time_64.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 3bc9c9979b92..58aa27b29984 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -816,14 +816,12 @@ void __init time_init(void)
clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT);
clocksource_tick.name = tick_ops->name;
- clocksource_calc_mult_shift(&clocksource_tick, freq, 4);
clocksource_tick.read = clocksource_tick_read;
+ clocksource_register_hz(&clocksource_tick, freq);
printk("clocksource: mult[%x] shift[%d]\n",
clocksource_tick.mult, clocksource_tick.shift);
- clocksource_register(&clocksource_tick);
-
sparc64_clockevent.name = tick_ops->name;
clockevents_calc_mult_shift(&sparc64_clockevent, freq, 4);