summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner2013-03-06 12:18:37 +0100
committerThomas Gleixner2013-03-13 11:39:40 +0100
commit35b61edb41ffee58711850e76215b852386ddb10 (patch)
tree781f01d855ca8185dc071bddd89282655f73fdcf
parentarm: Use tick broadcast expired check (diff)
downloadkernel-qcow2-linux-35b61edb41ffee58711850e76215b852386ddb10.tar.gz
kernel-qcow2-linux-35b61edb41ffee58711850e76215b852386ddb10.tar.xz
kernel-qcow2-linux-35b61edb41ffee58711850e76215b852386ddb10.zip
x86: Use tick broadcast expired check
Avoid going back into deep idle if the tick broadcast IPI is about to fire. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Arjan van de Veen <arjan@infradead.org> Cc: x86@kernel.org Link: http://lkml.kernel.org/r/20130306111537.702278273@linutronix.de
-rw-r--r--arch/x86/kernel/process.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 14ae10031ff0..aa524da03bba 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -336,6 +336,18 @@ void cpu_idle(void)
local_touch_nmi();
local_irq_disable();
+ /*
+ * We detected in the wakeup path that the
+ * tick broadcast device expired for us, but
+ * we raced with the other CPU and came back
+ * here before it was able to fire the IPI.
+ * No point in going idle.
+ */
+ if (tick_check_broadcast_expired()) {
+ local_irq_enable();
+ continue;
+ }
+
enter_idle();
/* Don't trace irqs off for idle */