diff options
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/timer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c index 19e25d2b64fc..cf67fc562054 100644 --- a/arch/ia64/sn/kernel/sn2/timer.c +++ b/arch/ia64/sn/kernel/sn2/timer.c | |||
| @@ -23,16 +23,14 @@ | |||
| 23 | 23 | ||
| 24 | extern unsigned long sn_rtc_cycles_per_second; | 24 | extern unsigned long sn_rtc_cycles_per_second; |
| 25 | 25 | ||
| 26 | static void __iomem *sn2_mc; | ||
| 27 | |||
| 28 | static cycle_t read_sn2(void) | 26 | static cycle_t read_sn2(void) |
| 29 | { | 27 | { |
| 30 | return (cycle_t)readq(sn2_mc); | 28 | return (cycle_t)readq(RTC_COUNTER_ADDR); |
| 31 | } | 29 | } |
| 32 | 30 | ||
| 33 | static struct clocksource clocksource_sn2 = { | 31 | static struct clocksource clocksource_sn2 = { |
| 34 | .name = "sn2_rtc", | 32 | .name = "sn2_rtc", |
| 35 | .rating = 300, | 33 | .rating = 450, |
| 36 | .read = read_sn2, | 34 | .read = read_sn2, |
| 37 | .mask = (1LL << 55) - 1, | 35 | .mask = (1LL << 55) - 1, |
| 38 | .mult = 0, | 36 | .mult = 0, |
| @@ -58,7 +56,6 @@ ia64_sn_udelay (unsigned long usecs) | |||
| 58 | 56 | ||
| 59 | void __init sn_timer_init(void) | 57 | void __init sn_timer_init(void) |
| 60 | { | 58 | { |
| 61 | sn2_mc = RTC_COUNTER_ADDR; | ||
| 62 | clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR; | 59 | clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR; |
| 63 | clocksource_sn2.mult = clocksource_hz2mult(sn_rtc_cycles_per_second, | 60 | clocksource_sn2.mult = clocksource_hz2mult(sn_rtc_cycles_per_second, |
| 64 | clocksource_sn2.shift); | 61 | clocksource_sn2.shift); |
