UBUNTU: SAUCE: s390/mm: fix local TLB flushing vs. detach of an mm address space

[mirror_ubuntu-zesty-kernel.git] / kernel / time / tick-common.c

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 4fcd99e12aa01ce3ce0fa24fb219d644a68417a3..49edc1c4f3e645894f839c40489ab81594a02398 100644 (file)
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -178,8 +178,8 @@ static void tick_setup_device(struct tick_device *td,
                              struct clock_event_device *newdev, int cpu,
                              const struct cpumask *cpumask)
 {
-       ktime_t next_event;
        void (*handler)(struct clock_event_device *) = NULL;
+       ktime_t next_event = 0;
 
        /*
         * First device setup ?
@@ -195,7 +195,7 @@ static void tick_setup_device(struct tick_device *td,
                        else
                                tick_do_timer_cpu = TICK_DO_TIMER_NONE;
                        tick_next_period = ktime_get();
-                       tick_period = ktime_set(0, NSEC_PER_SEC / HZ);
+                       tick_period = NSEC_PER_SEC / HZ;
                }
 
                /*