From f36b59d1a4fa1e29be606d0513b5f7fa6e720f79 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 26 Mar 2009 08:32:37 +0000 Subject: sh: Add MMU dependency for kexec Kexec is not likely to work on NON-MMU CPU because this added depend on MMU for kexec. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt --- arch/sh/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/sh/Kconfig') diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8d50d527c595..19566c8d9826 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -530,7 +530,7 @@ source kernel/Kconfig.hz config KEXEC bool "kexec system call (EXPERIMENTAL)" - depends on SUPERH32 && EXPERIMENTAL + depends on SUPERH32 && EXPERIMENTAL && MMU help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot -- cgit v1.2.3 From 8dafc34616282c1fd79d42a4353ee5322767d720 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 2 Apr 2009 11:56:38 +0900 Subject: sh: Select ARCH_HIBERNATION_POSSIBLE. Now that the requisite patches have gone in, this can safely be enabled across the board for all of the 32-bit SH platforms. Signed-off-by: Paul Mundt --- arch/sh/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/sh/Kconfig') diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 19566c8d9826..2af949a6a898 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -28,6 +28,7 @@ config SUPERH32 select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE select HAVE_ARCH_KGDB + select ARCH_HIBERNATION_POSSIBLE if MMU config SUPERH64 def_bool y if CPU_SH5 -- cgit v1.2.3 From e869a90ee1235a4f89ecb956e7b7d724d65217c8 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 2 Apr 2009 13:08:31 +0900 Subject: 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 --- arch/sh/Kconfig | 3 +++ arch/sh/include/asm/system.h | 1 + arch/sh/kernel/idle.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'arch/sh/Kconfig') 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 config ARCH_NO_VIRT_TO_BUS def_bool y +config ARCH_HAS_DEFAULT_IDLE + def_bool y + config IO_TRAPPED bool 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; extern struct dentry *sh_debugfs_root; void per_cpu_trap_init(void); +void default_idle(void); asmlinkage void break_point_trap(void); 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) } __setup("hlt", hlt_setup); -static void default_idle(void) +void default_idle(void) { if (!hlt_counter) { clear_thread_flag(TIF_POLLING_NRFLAG); -- cgit v1.2.3