|
@@ -687,7 +687,22 @@ out:
|
|
|
return tick;
|
|
|
}
|
|
|
|
|
|
-static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now);
|
|
|
+static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now)
|
|
|
+{
|
|
|
+ /* Update jiffies first */
|
|
|
+ tick_do_update_jiffies64(now);
|
|
|
+ update_cpu_load_nohz();
|
|
|
+
|
|
|
+ calc_load_exit_idle();
|
|
|
+ touch_softlockup_watchdog();
|
|
|
+ /*
|
|
|
+ * Cancel the scheduled timer and restore the tick
|
|
|
+ */
|
|
|
+ ts->tick_stopped = 0;
|
|
|
+ ts->idle_exittime = now;
|
|
|
+
|
|
|
+ tick_nohz_restart(ts, now);
|
|
|
+}
|
|
|
|
|
|
static void tick_nohz_full_update_tick(struct tick_sched *ts)
|
|
|
{
|
|
@@ -848,23 +863,6 @@ ktime_t tick_nohz_get_sleep_length(void)
|
|
|
return ts->sleep_length;
|
|
|
}
|
|
|
|
|
|
-static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now)
|
|
|
-{
|
|
|
- /* Update jiffies first */
|
|
|
- tick_do_update_jiffies64(now);
|
|
|
- update_cpu_load_nohz();
|
|
|
-
|
|
|
- calc_load_exit_idle();
|
|
|
- touch_softlockup_watchdog();
|
|
|
- /*
|
|
|
- * Cancel the scheduled timer and restore the tick
|
|
|
- */
|
|
|
- ts->tick_stopped = 0;
|
|
|
- ts->idle_exittime = now;
|
|
|
-
|
|
|
- tick_nohz_restart(ts, now);
|
|
|
-}
|
|
|
-
|
|
|
static void tick_nohz_account_idle_ticks(struct tick_sched *ts)
|
|
|
{
|
|
|
#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
|