p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Ingo Molnar 2013-07-25 23:03:28 +02:00
parent b3a3a9c441 ca06416b2b
commit 365d8c001f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/time/tick-sched.c
View File

@ -182,7 +182,8 @@ static bool can_stop_full_tick(void)
* Don't allow the user to think they can get * Don't allow the user to think they can get
* full NO_HZ with this machine. * 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; return false;
} }
#endif #endif
@ -343,8 +344,6 @@ static int tick_nohz_init_all(void)
void __init tick_nohz_init(void) void __init tick_nohz_init(void)
{ {
int cpu;
if (!have_nohz_full_mask) { if (!have_nohz_full_mask) {
if (tick_nohz_init_all() < 0) if (tick_nohz_init_all() < 0)
return; return;