diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 13:16:43 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 13:16:43 +0400 |
| commit | 50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6 (patch) | |
| tree | c76f080377dd611857fa33f38a2b8a2af4576f8b /arch/powerpc/platforms/pseries/processor_idle.c | |
| parent | a8b91e43afd736fcebb0836359e5ddaeae45b2ab (diff) | |
| parent | 50fb31cfed9218b439360caf7c0399b00042da15 (diff) | |
| download | linux-50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6.tar.xz | |
Merge branch 'merge' into next
We want to bring in the latest IRQ fixes
Diffstat (limited to 'arch/powerpc/platforms/pseries/processor_idle.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/processor_idle.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c index a97ef6692dad..7f5668b94165 100644 --- a/arch/powerpc/platforms/pseries/processor_idle.c +++ b/arch/powerpc/platforms/pseries/processor_idle.c @@ -100,15 +100,18 @@ out: static void check_and_cede_processor(void) { /* - * Interrupts are soft-disabled at this point, - * but not hard disabled. So an interrupt might have - * occurred before entering NAP, and would be potentially - * lost (edge events, decrementer events, etc...) unless - * we first hard disable then check. + * Ensure our interrupt state is properly tracked, + * also checks if no interrupt has occurred while we + * were soft-disabled */ - hard_irq_disable(); - if (!lazy_irq_pending()) + if (prep_irq_for_idle()) { cede_processor(); +#ifdef CONFIG_TRACE_IRQFLAGS + /* Ensure that H_CEDE returns with IRQs on */ + if (WARN_ON(!(mfmsr() & MSR_EE))) + __hard_irq_enable(); +#endif + } } static int dedicated_cede_loop(struct cpuidle_device *dev, |