diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-04-26 20:25:16 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-21 19:01:03 -0800 |
| commit | 60d687e7d4724a7e8826f6579ca036d4343a5386 (patch) | |
| tree | 9b4e0ab4770a83fc7da48a3a10fd4902fa053755 | |
| parent | 63e496340f07b58925f690451c93171d9b04fe1e (diff) | |
| download | op-kernel-dev-60d687e7d4724a7e8826f6579ca036d4343a5386.zip op-kernel-dev-60d687e7d4724a7e8826f6579ca036d4343a5386.tar.gz | |
clocksource: um: Convert to clocksource_register_hz/khz
This converts the um clocksource to use clocksource_register_hz/khz
This is untested, so any assistance in testing would be appreciated!
CC: Jeff Dike <jdike@addtoit.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
| -rw-r--r-- | arch/um/kernel/time.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index a08d9fa..82a6e22 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -75,8 +75,6 @@ static struct clocksource itimer_clocksource = { .rating = 300, .read = itimer_read, .mask = CLOCKSOURCE_MASK(64), - .mult = 1000, - .shift = 0, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -94,9 +92,9 @@ static void __init setup_itimer(void) clockevent_delta2ns(60 * HZ, &itimer_clockevent); itimer_clockevent.min_delta_ns = clockevent_delta2ns(1, &itimer_clockevent); - err = clocksource_register(&itimer_clocksource); + err = clocksource_register_hz(&itimer_clocksource, USEC_PER_SEC); if (err) { - printk(KERN_ERR "clocksource_register returned %d\n", err); + printk(KERN_ERR "clocksource_register_hz returned %d\n", err); return; } clockevents_register_device(&itimer_clockevent); |
