aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/pseries/processor_idle.c
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2012-06-27 13:13:52 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-06-29 14:35:37 +1000
commit0b17ba7258db83cd02da560884e053b85de371f2 (patch)
tree970b6d210323d31f037c8593fd325636ec40a843 /arch/powerpc/platforms/pseries/processor_idle.c
parentpowerpc/ftrace: Do not trace restore_interrupts() (diff)
downloadlinux-dev-0b17ba7258db83cd02da560884e053b85de371f2.tar.xz
linux-dev-0b17ba7258db83cd02da560884e053b85de371f2.zip
powerpc: check_and_cede_processor() never cedes
Commit f948501b36c6 ("Make hard_irq_disable() actually hard-disable interrupts") caused check_and_cede_processor to stop working. ->irq_happened will never be zero right after a hard_irq_disable so the compiler removes the call to cede_processor completely. The bug was introduced back in the lazy interrupt handling rework of 3.4 but was hidden until recently because hard_irq_disable did nothing. This issue will eventually appear in 3.4 stable since the hard_irq_disable fix is marked stable, so mark this one for stable too. Signed-off-by: Anton Blanchard <anton@samba.org> Cc: stable@vger.kernel.org Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to '')
-rw-r--r--arch/powerpc/platforms/pseries/processor_idle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c
index 41a34bc4a9a2..e61483e8e960 100644
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/arch/powerpc/platforms/pseries/processor_idle.c
@@ -106,7 +106,7 @@ static void check_and_cede_processor(void)
* we first hard disable then check.
*/
hard_irq_disable();
- if (get_paca()->irq_happened == 0)
+ if (!lazy_irq_pending())
cede_processor();
}