Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index a08d9fab81f2..82a6e22f1f35 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);