From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [linux-pm] [PATCH] CPUidle: compile fix for non-x86 Date: Thu, 31 Jan 2008 17:28:18 -0800 Message-ID: <871w7x5utp.fsf@paris.hilman.org> References: <200801301116.44902.rjw@sisk.pl> <200801312126.06816.rjw@sisk.pl> <87zlul7mgz.fsf@paris.hilman.org> <200801312203.16737.rjw@sisk.pl> <87myql7k8p.fsf@paris.hilman.org> <924EFEDD5F540B4284297C4DC59F3DEE720540@orsmsx423.amr.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from secure.mvista.com ([63.81.120.158]:4608 "EHLO gateway-1237.mvista.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752825AbYBAB2U (ORCPT ); Thu, 31 Jan 2008 20:28:20 -0500 In-Reply-To: <924EFEDD5F540B4284297C4DC59F3DEE720540@orsmsx423.amr.corp.intel.com> (Venkatesh Pallipadi's message of "Thu\, 31 Jan 2008 16\:25\:12 -0800") Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: "Pallipadi, Venkatesh" Cc: "Rafael J. Wysocki" , Len Brown , ACPI Devel Maling List OK, one more (last?) time. :) Convert cpu_idle_wait() to cpuidle_kick_cpus() macro which is SMP-only, and gives error on non supported CPU. Signed-off-by: Kevin Hilman diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 80b7ba4..a3e8ef4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -105,6 +105,9 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n +config ARCH_HAS_CPU_IDLE_WAIT + def_bool y + config GENERIC_CALIBRATE_DELAY def_bool y diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index d2fabe7..794962d 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -82,7 +82,7 @@ void cpuidle_uninstall_idle_handler(void) { if (enabled_devices && (pm_idle != pm_idle_old)) { pm_idle = pm_idle_old; - cpu_idle_wait(); + cpuidle_kick_cpus(); } } diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index c4e0016..b1c7355 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -72,6 +72,19 @@ cpuidle_set_statedata(struct cpuidle_state *state, void *data) state->driver_data = data; } +#ifdef CONFIG_SMP +#ifdef CONFIG_ARCH_HAS_CPU_IDLE_WAIT +static inline void cpuidle_kick_cpus(void) +{ + cpu_idle_wait() +} +#else /* !ARCH_HAS_CPU_IDLE_WAIT */ +#error "Arch needs cpu_idle_wait() equivalent here" +#endif /* !ARCH_HAS_CPU_IDLE_WAIT */ +#else /* !CONFIG_SMP */ +static inline void cpuidle_kick_cpus(void) {} +#endif /* !CONFIG_SMP */ + struct cpuidle_state_kobj { struct cpuidle_state *state; struct completion kobj_unregister;