diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-04-26 23:20:47 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-02-21 16:33:45 -0500 |
commit | d60c3041778c11f564969fb62b337df68232ee80 (patch) | |
tree | 67154170286795c1414b7c7bd19c3e24a75b49eb /arch/ia64/kernel/time.c | |
parent | b01cc1b0eae0dea19257b29347116505fbedf679 (diff) |
ia64: convert to clocksource_register_hz/khz
This converts the ia64 clocksources to use clocksource_register_hz/khz
CC: Tony Luck <tony.luck@intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Tony Luck <tony.luck@intel.com> [clocksource_itc path]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'arch/ia64/kernel/time.c')
-rw-r--r-- | arch/ia64/kernel/time.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 9702fa92489..41c40f0e479 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -73,8 +73,6 @@ static struct clocksource clocksource_itc = { | |||
73 | .rating = 350, | 73 | .rating = 350, |
74 | .read = itc_get_cycles, | 74 | .read = itc_get_cycles, |
75 | .mask = CLOCKSOURCE_MASK(64), | 75 | .mask = CLOCKSOURCE_MASK(64), |
76 | .mult = 0, /*to be calculated*/ | ||
77 | .shift = 16, | ||
78 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 76 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
79 | #ifdef CONFIG_PARAVIRT | 77 | #ifdef CONFIG_PARAVIRT |
80 | .resume = paravirt_clocksource_resume, | 78 | .resume = paravirt_clocksource_resume, |
@@ -374,11 +372,8 @@ ia64_init_itm (void) | |||
374 | ia64_cpu_local_tick(); | 372 | ia64_cpu_local_tick(); |
375 | 373 | ||
376 | if (!itc_clocksource) { | 374 | if (!itc_clocksource) { |
377 | /* Sort out mult/shift values: */ | 375 | clocksource_register_hz(&clocksource_itc, |
378 | clocksource_itc.mult = | 376 | local_cpu_data->itc_freq); |
379 | clocksource_hz2mult(local_cpu_data->itc_freq, | ||
380 | clocksource_itc.shift); | ||
381 | clocksource_register(&clocksource_itc); | ||
382 | itc_clocksource = &clocksource_itc; | 377 | itc_clocksource = &clocksource_itc; |
383 | } | 378 | } |
384 | } | 379 | } |