| Message ID | alpine.LFD.2.11.1402171101060.17677@knanqh.ubzr (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, Feb 17, 2014 at 11:09:45AM -0500, Nicolas Pitre wrote: > I noticed commit c0b5d598aefda in linux-next adds a call to > cpuidle_idle_call(). At the same time we're rationalizing the idle > handling code in order to integrate it with the scheduler proper. > Please note that a similar patch to the one below will be necessary once > everything gets merged together. So how shall we merge this patch, shall I fold it into c0b5d598aefda or? Ralf -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 21 Feb 2014, Ralf Baechle wrote: > On Mon, Feb 17, 2014 at 11:09:45AM -0500, Nicolas Pitre wrote: > > > I noticed commit c0b5d598aefda in linux-next adds a call to > > cpuidle_idle_call(). At the same time we're rationalizing the idle > > handling code in order to integrate it with the scheduler proper. > > Please note that a similar patch to the one below will be necessary once > > everything gets merged together. > > So how shall we merge this patch, shall I fold it into c0b5d598aefda or? Merging it on your side is probably the best option. There would be a window in mainline during which the callback registered with cpuidle won't be invoked, but that is not worse than the v3.13 behavior. Nicolas -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c index 4b1554b3f5..2d753de5dc 100644 --- a/arch/mips/kernel/idle.c +++ b/arch/mips/kernel/idle.c @@ -253,8 +253,7 @@ static void mips_cpu_idle(void) void arch_cpu_idle(void) { - if (cpuidle_idle_call()) - mips_cpu_idle(); + mips_cpu_idle(); } #ifdef CONFIG_CPU_IDLE
The core idle loop now takes care of it. Signed-off-by: Nicolas Pitre <nico@linaro.org> --- I noticed commit c0b5d598aefda in linux-next adds a call to cpuidle_idle_call(). At the same time we're rationalizing the idle handling code in order to integrate it with the scheduler proper. Please note that a similar patch to the one below will be necessary once everything gets merged together. -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html