Skip to content

Commit

Permalink
Merge branch 'timers/urgent' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/git/frederic/linux-dynticks into timers/urgent

Pull nohz fixes from Frederic Weisbecker.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Ingo Molnar committed Jul 25, 2013
2 parents b3a3a9c + ca06416 commit 365d8c0
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions kernel/time/tick-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 365d8c0

Please sign in to comment.