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/sn/kernel/sn2/timer.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/sn/kernel/sn2/timer.c')
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/timer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c index 21d6f09e3447..c34efda122e1 100644 --- a/arch/ia64/sn/kernel/sn2/timer.c +++ b/arch/ia64/sn/kernel/sn2/timer.c | |||
| @@ -33,8 +33,6 @@ static struct clocksource clocksource_sn2 = { | |||
| 33 | .rating = 450, | 33 | .rating = 450, |
| 34 | .read = read_sn2, | 34 | .read = read_sn2, |
| 35 | .mask = (1LL << 55) - 1, | 35 | .mask = (1LL << 55) - 1, |
| 36 | .mult = 0, | ||
| 37 | .shift = 10, | ||
| 38 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 36 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 39 | }; | 37 | }; |
| 40 | 38 | ||
| @@ -57,9 +55,7 @@ ia64_sn_udelay (unsigned long usecs) | |||
| 57 | void __init sn_timer_init(void) | 55 | void __init sn_timer_init(void) |
| 58 | { | 56 | { |
| 59 | clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR; | 57 | clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR; |
| 60 | clocksource_sn2.mult = clocksource_hz2mult(sn_rtc_cycles_per_second, | 58 | clocksource_register_hz(&clocksource_sn2, sn_rtc_cycles_per_second); |
| 61 | clocksource_sn2.shift); | ||
| 62 | clocksource_register(&clocksource_sn2); | ||
| 63 | 59 | ||
| 64 | ia64_udelay = &ia64_sn_udelay; | 60 | ia64_udelay = &ia64_sn_udelay; |
| 65 | } | 61 | } |