Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[pandora-kernel.git] / kernel / time / tick-common.c

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 119528d..da6c9ec 100644 (file)
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -94,7 +94,7 @@ void tick_handle_periodic(struct clock_event_device *dev)
         */
        next = ktime_add(dev->next_event, tick_period);
        for (;;) {
-               if (!clockevents_program_event(dev, next, ktime_get()))
+               if (!clockevents_program_event(dev, next, false))
                        return;
                /*
                 * Have to be careful here. If we're in oneshot mode,
@@ -137,7 +137,7 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
                clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT);
 
                for (;;) {
-                       if (!clockevents_program_event(dev, next, ktime_get()))
+                       if (!clockevents_program_event(dev, next, false))
                                return;
                        next = ktime_add(next, tick_period);
                }