Commit 97a5b81f authored May 02, 2013 by Thomas Gleixner

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 <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>

parent 78d77df7

arch/x86/kernel/process.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -312,6 +312,8 @@ void arch_cpu_idle(void)
	{		{
	if (cpuidle_idle_call())		if (cpuidle_idle_call())
	x86_idle();		x86_idle();
			else
			local_irq_enable();
	}		}

	/*		/*
	@@ -368,9 +370,6 @@ void amd_e400_remove_cpu(int cpu)
	*/		*/
	static void amd_e400_idle(void)		static void amd_e400_idle(void)
	{		{
	if (need_resched())
	return;

	if (!amd_e400_c1e_detected) {		if (!amd_e400_c1e_detected) {
	u32 lo, hi;		u32 lo, hi;