aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-02 00:08:31 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-04-02 00:08:31 -0400
commite869a90ee1235a4f89ecb956e7b7d724d65217c8 (patch)
tree301059ac2ebc4c0ac8251765a3a87e4b2518bfc8 /arch
parenteeee7853c4ffaf5b9eb58f39708e3c78f66cee15 (diff)
sh: Wire up ARCH_HAS_DEFAULT_IDLE for cpuidle.
cpuidle wants ARCH_HAS_DEFAULT_IDLE defined in order to use the default idle loop. So, make it accessible and enable it for all sh machines. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sh/include/asm/system.h1
-rw-r--r--arch/sh/kernel/idle.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 2af949a6a898..6a1e79b886c1 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -130,6 +130,9 @@ config ARCH_HAS_ILOG2_U64
130config ARCH_NO_VIRT_TO_BUS 130config ARCH_NO_VIRT_TO_BUS
131 def_bool y 131 def_bool y
132 132
133config ARCH_HAS_DEFAULT_IDLE
134 def_bool y
135
133config IO_TRAPPED 136config IO_TRAPPED
134 bool 137 bool
135 138
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index c9ec6af8e745..a88895e6dcb0 100644
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -153,6 +153,7 @@ extern unsigned long cached_to_uncached;
153extern struct dentry *sh_debugfs_root; 153extern struct dentry *sh_debugfs_root;
154 154
155void per_cpu_trap_init(void); 155void per_cpu_trap_init(void);
156void default_idle(void);
156 157
157asmlinkage void break_point_trap(void); 158asmlinkage void break_point_trap(void);
158 159
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index fe59ccfc1152..f35ed0348850 100644
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -38,7 +38,7 @@ static int __init hlt_setup(char *__unused)
38} 38}
39__setup("hlt", hlt_setup); 39__setup("hlt", hlt_setup);
40 40
41static void default_idle(void) 41void default_idle(void)
42{ 42{
43 if (!hlt_counter) { 43 if (!hlt_counter) {
44 clear_thread_flag(TIF_POLLING_NRFLAG); 44 clear_thread_flag(TIF_POLLING_NRFLAG);