diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-10-19 20:58:48 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-21 22:01:05 -0500 |
| commit | 027f6ad7bfa97cf8f75e9d81c15256d828eb0809 (patch) | |
| tree | 3db3a3a7eea1c57368c84044b25fe04a72e2d186 /arch/cris/arch-v32/kernel | |
| parent | a139723bec122053a94c80596c8b991b860ffb91 (diff) | |
clocksource: cris: Convert to clocksource_register_khz
This converts the cris architecture to use clocksource_register_khz
This is untested, so any help from maintainers would be appreciated.
CC: Mikael Starvik <starvik@axis.com>
CC: Jesper Nilsson <jesper.nilsson@axis.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'arch/cris/arch-v32/kernel')
| -rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index bb978ede8985..6773fc83a670 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c | |||
| @@ -47,14 +47,12 @@ static struct clocksource cont_rotime = { | |||
| 47 | .rating = 300, | 47 | .rating = 300, |
| 48 | .read = read_cont_rotime, | 48 | .read = read_cont_rotime, |
| 49 | .mask = CLOCKSOURCE_MASK(32), | 49 | .mask = CLOCKSOURCE_MASK(32), |
| 50 | .shift = 10, | ||
| 51 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 50 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 52 | }; | 51 | }; |
| 53 | 52 | ||
| 54 | static int __init etrax_init_cont_rotime(void) | 53 | static int __init etrax_init_cont_rotime(void) |
| 55 | { | 54 | { |
| 56 | cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift); | 55 | clocksource_register_khz(&cont_rotime, 100000); |
| 57 | clocksource_register(&cont_rotime); | ||
| 58 | return 0; | 56 | return 0; |
| 59 | } | 57 | } |
| 60 | arch_initcall(etrax_init_cont_rotime); | 58 | arch_initcall(etrax_init_cont_rotime); |
