diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 22:13:49 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 22:13:49 +0100 |
| commit | 0518469d0a32be1e6dd8850ff274d52d72cdb52d (patch) | |
| tree | c13038d099e04208feae565947783cf92ceae9ee /arch/um | |
| parent | 28a00184be261e3dc152ba0d664a067bbe235b6a (diff) | |
| parent | f5a54dd7952e9032785cd1ef0dde72cd61025341 (diff) | |
Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'arch/um')
| -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 a08d9fab81f..82a6e22f1f3 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); |