diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 15:01:06 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 15:01:06 +0400 |
| commit | 93bc11c3cc1f6d441df2362f0d3efea75dc0e3f4 (patch) | |
| tree | a6adc2d83018b98e45c91dbbc9c80e95d8a671b1 /include | |
| parent | 3e79a8a67d6f28b2b1d4344253ca612e77cca8e6 (diff) | |
| parent | b39b0981b0811943d724915a8a0150d6ac5110e0 (diff) | |
| download | linux-93bc11c3cc1f6d441df2362f0d3efea75dc0e3f4.tar.xz | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: Fix ARCH_NEEDS_CPU_IDLE_COUPLED dependency warning
cpuidle: Comment the driver's framework code
cpuidle: simplify multiple driver support
ARM: zynq: Add cpuidle support
cpuidle: improve governor Kconfig options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 8f0406230a0a..0bc4b74668e9 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -111,6 +111,9 @@ struct cpuidle_driver { struct cpuidle_state states[CPUIDLE_STATE_MAX]; int state_count; int safe_state_index; + + /* the driver handles the cpus in cpumask */ + struct cpumask *cpumask; }; #ifdef CONFIG_CPU_IDLE @@ -135,9 +138,6 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); extern int cpuidle_play_dead(void); extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev); -extern int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu); -extern void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu); - #else static inline void disable_cpuidle(void) { } static inline int cpuidle_idle_call(void) { return -ENODEV; } |