diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 22:34:52 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 22:34:52 (GMT) |
| commit | 309b51e87905e8a52060dbbab1e427552d5dda9a (patch) | |
| tree | 891aaefe5d347de1b3b1b233fa62b9e576b4e096 /include | |
| parent | 3a55fb0d9fe8e2f4594329edd58c5fd6f35a99dd (diff) | |
| parent | 8aef33a7cf40ca9da188e8578b2abe7267a38c52 (diff) | |
| download | linux-309b51e87905e8a52060dbbab1e427552d5dda9a.tar.xz | |
Merge tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki:
- cpuidle regression fix related to the initialization of state
kobjects from Krzysztof Mazur.
- cpuidle fix removing some not very useful code and making some
user-visible problems go away at the same time. From Daniel Lezcano.
- ACPI build fix from Yinghai Lu.
* tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpuidle: remove the power_specified field in the driver
ACPI / glue: Fix build with ACPI_GLUE_DEBUG set
cpuidle: fix number of initialized/destroyed states
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 3711b34..24cd1037 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -126,9 +126,9 @@ struct cpuidle_driver { struct module *owner; int refcnt; - unsigned int power_specified:1; /* set to 1 to use the core cpuidle time keeping (for all states). */ unsigned int en_core_tk_irqen:1; + /* states array must be ordered in decreasing power consumption */ struct cpuidle_state states[CPUIDLE_STATE_MAX]; int state_count; int safe_state_index; |