diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 21:54:15 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 21:54:15 -1000 |
| commit | 35e51fe82ddcd8fb7f129d6dd8491c097d388665 (patch) | |
| tree | d6dd5e860c0e68a1af7976990c7d624e7362415d /include | |
| parent | c0c770e610cc4cdcd66c7e939bdf89cc3e72f79d (diff) | |
| parent | a0bfa1373859e9d11dc92561a8667588803e42d8 (diff) | |
| download | linux-35e51fe82ddcd8fb7f129d6dd8491c097d388665.tar.bz2 | |
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
cpuidle: stop depending on pm_idle
x86 idle: move mwait_idle_with_hints() to where it is used
cpuidle: replace xen access to x86 pm_idle and default_idle
cpuidle: create bootparam "cpuidle.off=1"
mrst_pmu: driver for Intel Moorestown Power Management Unit
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 36719ead50e8..b51629e15cfc 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -122,6 +122,8 @@ struct cpuidle_driver { }; #ifdef CONFIG_CPU_IDLE +extern void disable_cpuidle(void); +extern int cpuidle_idle_call(void); extern int cpuidle_register_driver(struct cpuidle_driver *drv); struct cpuidle_driver *cpuidle_get_driver(void); @@ -135,6 +137,8 @@ extern int cpuidle_enable_device(struct cpuidle_device *dev); extern void cpuidle_disable_device(struct cpuidle_device *dev); #else +static inline void disable_cpuidle(void) { } +static inline int cpuidle_idle_call(void) { return -ENODEV; } static inline int cpuidle_register_driver(struct cpuidle_driver *drv) {return -ENODEV; } |