From b5b53eae51ec68534910ab443530764da888196b Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 26 Apr 2010 20:25:16 -0700 Subject: [PATCH] --- yaml --- r: 277424 b: refs/heads/master c: 60d687e7d4724a7e8826f6579ca036d4343a5386 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/time.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2ace83d11feb..48bc01d698a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63e496340f07b58925f690451c93171d9b04fe1e +refs/heads/master: 60d687e7d4724a7e8826f6579ca036d4343a5386 diff --git a/trunk/arch/um/kernel/time.c b/trunk/arch/um/kernel/time.c index a08d9fab81f2..82a6e22f1f35 100644 --- a/trunk/arch/um/kernel/time.c +++ b/trunk/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);