From: akpm@linux-foundation.org Subject: [patch 1/6] git-acpi-fix-cpuidle-borkage 2 Date: Tue, 06 Mar 2007 02:29:39 -0800 Message-ID: <200703061029.l26ATdeL019116@shell0.pdx.osdl.net> Return-path: Received: from smtp.osdl.org ([65.172.181.24]:33957 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933224AbXCFKb1 (ORCPT ); Tue, 6 Mar 2007 05:31:27 -0500 Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, venkatesh.pallipadi@intel.com, abelay@novell.com, len.brown@intel.com, shaohua.li@intel.com From: Venkatesh Pallipadi Fix the compile issues when CPU_IDLE is not configured. Signed-off-by: Venkatesh Pallipadi Cc: Adam Belay Cc: Shaohua Li Cc: Len Brown Signed-off-by: Andrew Morton --- include/linux/cpuidle.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff -puN include/linux/cpuidle.h~git-acpi-fix-cpuidle-borkage-2 include/linux/cpuidle.h --- a/include/linux/cpuidle.h~git-acpi-fix-cpuidle-borkage-2 +++ a/include/linux/cpuidle.h @@ -130,10 +130,21 @@ struct cpuidle_driver { struct module *owner; }; +#ifdef CONFIG_CPU_IDLE + extern int cpuidle_register_driver(struct cpuidle_driver *drv); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); extern int cpuidle_force_redetect(struct cpuidle_device *dev); +#else + +static inline int cpuidle_register_driver(struct cpuidle_driver *drv) +{return 0;} +static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { } +static inline int cpuidle_force_redetect(struct cpuidle_device *dev) +{return 0;} + +#endif /****************************** * CPUIDLE GOVERNOR INTERFACE * @@ -153,8 +164,20 @@ struct cpuidle_governor { struct module *owner; }; +#ifdef CONFIG_CPU_IDLE + extern int cpuidle_register_governor(struct cpuidle_governor *gov); extern void cpuidle_unregister_governor(struct cpuidle_governor *gov); extern int cpuidle_get_bm_activity(void); +#else + +static inline int cpuidle_register_governor(struct cpuidle_governor *gov) +{return 0;} +static inline void cpuidle_unregister_governor(struct cpuidle_governor *gov) { } +static inline int cpuidle_get_bm_activity(void) +{return 0;} + +#endif + #endif /* _LINUX_CPUIDLE_H */ _