Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 86baa4f..beef7cc 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -284,6 +284,7 @@ void tick_nohz_stop_sched_tick(void)
                        ts->tick_stopped = 1;
                        ts->idle_jiffies = last_jiffies;
                        rcu_enter_nohz();
                        ts->tick_stopped = 1;
                        ts->idle_jiffies = last_jiffies;
                        rcu_enter_nohz();

+                       sched_clock_tick_stop(cpu);

                }
 
                /*
                }
 
                /*


@@ -383,6 +384,7 @@ void tick_nohz_restart_sched_tick(void)
        select_nohz_load_balancer(0);
        now = ktime_get();
        tick_do_update_jiffies64(now);
        select_nohz_load_balancer(0);
        now = ktime_get();
        tick_do_update_jiffies64(now);

+       sched_clock_tick_start(cpu);

        cpu_clear(cpu, nohz_cpu_mask);
 
        /*
        cpu_clear(cpu, nohz_cpu_mask);
 
        /*