2012/12/21 Steven Rostedt <rost...@goodmis.org>: > On Thu, 2012-12-20 at 19:32 +0100, Frederic Weisbecker wrote: > > kernel/time/tick-sched.c:517:6: error: have_full_nohz_mask undeclared > (first use in this function) > > >> --- a/kernel/time/tick-sched.c >> +++ b/kernel/time/tick-sched.c >> @@ -112,7 +112,8 @@ static void tick_sched_do_timer(ktime_t now) >> * this duty, then the jiffies update is still serialized by >> * jiffies_lock. >> */ >> - if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE)) >> + if (unlikely(tick_do_timer_cpu == TICK_DO_TIMER_NONE) >> + && !tick_nohz_full_cpu(cpu)) >> tick_do_timer_cpu = cpu; >> #endif >> >> @@ -512,6 +513,10 @@ static bool can_stop_idle_tick(int cpu, struct >> tick_sched *ts) >> return false; >> } >> >> + /* If there are full nohz CPUs around, we need to keep the timekeeping >> duty */ >> + if (have_full_nohz_mask && tick_do_timer_cpu == cpu) >> + return false; >> + >> return true; >> } >> > > Fold in: > > diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c > index 4a68b50..00e5682 100644 > --- a/kernel/time/tick-sched.c > +++ b/kernel/time/tick-sched.c > @@ -164,6 +164,8 @@ static int __init tick_nohz_full_setup(char *str) > return 1; > } > __setup("full_nohz=", tick_nohz_full_setup); > +#else > +#define have_full_nohz_mask 0 > #endif
Ah thanks! I'm folding your patch. I can add your SOB, right? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/