Commit-ID: 97a5b81fa4d3a11dcdf224befc577f2e0abadc0b Gitweb: http://git.kernel.org/tip/97a5b81fa4d3a11dcdf224befc577f2e0abadc0b Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Thu, 2 May 2013 16:21:15 +0200 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Tue, 7 May 2013 16:24:03 +0200
x86: Fix idle consolidation fallout The core code expects the arch idle code to return with interrupts enabled. The conversion missed two x86 cases which fail to do that. Reported-and-tested-by: Markus Trippelsdorf <mar...@trippelsdorf.de> Tested-by: Borislav Petkov <b...@alien8.de> Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1305021557030.3972@ionos Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- arch/x86/kernel/process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 607af0d..4e7a37f 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -312,6 +312,8 @@ void arch_cpu_idle(void) { if (cpuidle_idle_call()) x86_idle(); + else + local_irq_enable(); } /* @@ -368,9 +370,6 @@ void amd_e400_remove_cpu(int cpu) */ static void amd_e400_idle(void) { - if (need_resched()) - return; - if (!amd_e400_c1e_detected) { u32 lo, hi; -- 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/
