Commit 365d8c00 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'timers/urgent' of... 

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: default avatarIngo Molnar <mingo@kernel.org>
parents b3a3a9c4 ca06416b

kernel/time/tick-sched.c

+2 −3
Original line number Diff line number Diff line
@@ -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;