diff options
author | John Stultz <johnstul@us.ibm.com> | 2011-06-01 03:32:50 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-06-03 17:26:21 -0400 |
commit | 9f14517bd6f38cf4b48d742a0ac5db9d17edecba (patch) | |
tree | 5753f6f5b6d8a5a1e7692669dd9a55c421f4fe20 /arch/tile/kernel | |
parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) |
clocksource: tile: convert to use clocksource_register_hz
Convert tile to use clocksource_register_hz.
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r-- | arch/tile/kernel/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index c4be58cc5d50..f6f50f2a5e37 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c | |||
@@ -78,7 +78,6 @@ static struct clocksource cycle_counter_cs = { | |||
78 | .rating = 300, | 78 | .rating = 300, |
79 | .read = clocksource_get_cycles, | 79 | .read = clocksource_get_cycles, |
80 | .mask = CLOCKSOURCE_MASK(64), | 80 | .mask = CLOCKSOURCE_MASK(64), |
81 | .shift = 22, /* typical value, e.g. x86 tsc uses this */ | ||
82 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 81 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
83 | }; | 82 | }; |
84 | 83 | ||
@@ -91,8 +90,6 @@ void __init setup_clock(void) | |||
91 | cycles_per_sec = hv_sysconf(HV_SYSCONF_CPU_SPEED); | 90 | cycles_per_sec = hv_sysconf(HV_SYSCONF_CPU_SPEED); |
92 | sched_clock_mult = | 91 | sched_clock_mult = |
93 | clocksource_hz2mult(cycles_per_sec, SCHED_CLOCK_SHIFT); | 92 | clocksource_hz2mult(cycles_per_sec, SCHED_CLOCK_SHIFT); |
94 | cycle_counter_cs.mult = | ||
95 | clocksource_hz2mult(cycles_per_sec, cycle_counter_cs.shift); | ||
96 | } | 93 | } |
97 | 94 | ||
98 | void __init calibrate_delay(void) | 95 | void __init calibrate_delay(void) |
@@ -107,7 +104,7 @@ void __init calibrate_delay(void) | |||
107 | void __init time_init(void) | 104 | void __init time_init(void) |
108 | { | 105 | { |
109 | /* Initialize and register the clock source. */ | 106 | /* Initialize and register the clock source. */ |
110 | clocksource_register(&cycle_counter_cs); | 107 | clocksource_register_hz(&cycle_counter_cs, cycles_per_sec); |
111 | 108 | ||
112 | /* Start up the tile-timer interrupt source on the boot cpu. */ | 109 | /* Start up the tile-timer interrupt source on the boot cpu. */ |
113 | setup_tile_timer(); | 110 | setup_tile_timer(); |