---

yaml --- r: 117336 b: refs/heads/master c: 89cedfe h: refs/heads/master v: v3
git-mirror · Oct 16, 2008 · 03c971c · 03c971c
1 parent 323c36f
commit 03c971c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: addbad46ed0906cd584784423b9d0babc7476446
+refs/heads/master: 89cedfefca1d446ee2598fd3bcbb23ee3802e26a
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -123,6 +123,9 @@ config GENERIC_TIME_VSYSCALL
 config ARCH_HAS_CPU_RELAX
 	def_bool y
 
+config ARCH_HAS_DEFAULT_IDLE
+	def_bool y
+
 config ARCH_HAS_CACHE_LINE_SIZE
 	def_bool y
 

diff --git a/trunk/drivers/cpuidle/cpuidle.c b/trunk/drivers/cpuidle/cpuidle.c
@@ -56,7 +56,11 @@ static void cpuidle_idle_call(void)
 		if (pm_idle_old)
 			pm_idle_old();
 		else
+#if defined(CONFIG_ARCH_HAS_DEFAULT_IDLE)
+			default_idle();
+#else
 			local_irq_enable();
+#endif
 		return;
 	}