From b10a8b5b9b0cd3d63fbbc4ad1b83be503b82d233 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 26 Apr 2010 20:24:37 -0700 Subject: [PATCH] --- yaml --- r: 245614 b: refs/heads/master c: 39280742efb00ab61ad62486c737fdd3e980c30f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/time_64.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f8ee89000e97..0b7c30f3d98b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7861434fe9b5c9dad1bbb1f674cded95950e778e +refs/heads/master: 39280742efb00ab61ad62486c737fdd3e980c30f diff --git a/trunk/arch/sparc/kernel/time_64.c b/trunk/arch/sparc/kernel/time_64.c index 3bc9c9979b92..58aa27b29984 100644 --- a/trunk/arch/sparc/kernel/time_64.c +++ b/trunk/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);