x86: Fix idle consolidation fallout

KAGA-KOKO · KAGA-KOKO · commit 97a5b81fa4d3 · 2013-05-07T16:24:03.000+02:00
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 <markus@trippelsdorf.de> Tested-by: Borislav Petkov <bp@alien8.de> Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1305021557030.3972@ionos Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,8 @@ void arch_cpu_idle(void)`
`312`	`312`	`{`
`313`	`313`	`if (cpuidle_idle_call())`
`314`	`314`	`x86_idle();`
	`315`	`+ else`
	`316`	`+ local_irq_enable();`
`315`	`317`	`}`
`316`	`318`
`317`	`319`	`/*`
`@@ -368,9 +370,6 @@ void amd_e400_remove_cpu(int cpu)`
`368`	`370`	`*/`
`369`	`371`	`static void amd_e400_idle(void)`
`370`	`372`	`{`
`371`		`- if (need_resched())`
`372`		`- return;`
`373`		`-`
`374`	`373`	`if (!amd_e400_c1e_detected) {`
`375`	`374`	`u32 lo, hi;`
`376`	`375`