diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2015-05-29 08:42:15 -0400 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2015-07-29 09:45:01 -0400 |
commit | 59d2c7ca492d7a7093755e4108390e4dac8b6365 (patch) | |
tree | 21335c11d4df6e73d024ba2c36f6b615b2c7d9f4 | |
parent | 73738a95d00467812664b7f86ba3052f5faf96d7 (diff) |
nohz: Move tick_nohz_restart_sched_tick() above its users
Fix the function declaration/definition dance.
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
-rw-r--r-- | kernel/time/tick-sched.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index a06cd4af0ff1..6b0d14d4c350 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
@@ -687,7 +687,22 @@ out: | |||
687 | return tick; | 687 | return tick; |
688 | } | 688 | } |
689 | 689 | ||
690 | static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now); | 690 | static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) |
691 | { | ||
692 | /* Update jiffies first */ | ||
693 | tick_do_update_jiffies64(now); | ||
694 | update_cpu_load_nohz(); | ||
695 | |||
696 | calc_load_exit_idle(); | ||
697 | touch_softlockup_watchdog(); | ||
698 | /* | ||
699 | * Cancel the scheduled timer and restore the tick | ||
700 | */ | ||
701 | ts->tick_stopped = 0; | ||
702 | ts->idle_exittime = now; | ||
703 | |||
704 | tick_nohz_restart(ts, now); | ||
705 | } | ||
691 | 706 | ||
692 | static void tick_nohz_full_update_tick(struct tick_sched *ts) | 707 | static void tick_nohz_full_update_tick(struct tick_sched *ts) |
693 | { | 708 | { |
@@ -848,23 +863,6 @@ ktime_t tick_nohz_get_sleep_length(void) | |||
848 | return ts->sleep_length; | 863 | return ts->sleep_length; |
849 | } | 864 | } |
850 | 865 | ||
851 | static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) | ||
852 | { | ||
853 | /* Update jiffies first */ | ||
854 | tick_do_update_jiffies64(now); | ||
855 | update_cpu_load_nohz(); | ||
856 | |||
857 | calc_load_exit_idle(); | ||
858 | touch_softlockup_watchdog(); | ||
859 | /* | ||
860 | * Cancel the scheduled timer and restore the tick | ||
861 | */ | ||
862 | ts->tick_stopped = 0; | ||
863 | ts->idle_exittime = now; | ||
864 | |||
865 | tick_nohz_restart(ts, now); | ||
866 | } | ||
867 | |||
868 | static void tick_nohz_account_idle_ticks(struct tick_sched *ts) | 866 | static void tick_nohz_account_idle_ticks(struct tick_sched *ts) |
869 | { | 867 | { |
870 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE | 868 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE |