diff options
| author | Ingo Molnar | 2013-07-25 23:03:28 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-07-25 23:03:28 +0200 |
| commit | 365d8c001f8eaf18fe9b8c53d2ced4489bcf6b0a (patch) | |
| tree | 2593eb4f486e7e7530dc0aa9ae6a2704125c94e8 | |
| parent | b3a3a9c441e2c8f6b6760de9331023a7906a4ac6 (diff) | |
| parent | ca06416b2b4fa562cd3c3f9eb4198c3b2a983342 (diff) | |
Merge branch 'timers/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/urgent
Pull nohz fixes from Frederic Weisbecker.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | kernel/time/tick-sched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index e80183f4a6c4..9563c744dad2 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -182,7 +182,8 @@ static bool can_stop_full_tick(void) * Don't allow the user to think they can get * full NO_HZ with this machine. */ - WARN_ONCE(1, "NO_HZ FULL will not work with unstable sched clock"); + WARN_ONCE(have_nohz_full_mask, + "NO_HZ FULL will not work with unstable sched clock"); return false; } #endif @@ -343,8 +344,6 @@ static int tick_nohz_init_all(void) void __init tick_nohz_init(void) { - int cpu; - if (!have_nohz_full_mask) { if (tick_nohz_init_all() < 0) return; |