diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 16:12:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 16:12:46 -0400 |
commit | c4ec20717313daafba59225f812db89595952b83 (patch) | |
tree | 253337453b1dc965c40668e4949337ed1c46cab7 /include/acpi/processor.h | |
parent | ec2626815bf9a9922e49820b03e670e833f3ca3c (diff) | |
parent | 00a2b433557f10736e8a02de619b3e9052556c12 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (41 commits)
ACPICA: hw: Don't carry spinlock over suspend
ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write}
ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle
ACPI: clean up acpi_enter_sleep_state_prep
Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish
ACPI: suppress uninitialized var warning
cpuidle: consolidate 2.6.22 cpuidle branch into one patch
ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs
ACPI: AC: Add sysfs interface
ACPI: SBS: Add sysfs alarm
ACPI: SBS: Add ACPI_PROCFS around procfs handling code.
ACPI: SBS: Add support for power_supply class (and sysfs)
ACPI: SBS: Make SBS reads table-driven.
ACPI: SBS: Simplify data structures in SBS
ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002)
ACPI: EC: Add new query handler to list head.
ACPI: Add acpi_bus_generate_event4() function
ACPI: Battery: add sysfs alarm
ACPI: Battery: Add sysfs support
ACPI: Battery: Misc clean-ups, no functional changes
...
Fix up conflicts in drivers/misc/thinkpad_acpi.[ch] manually
Diffstat (limited to 'include/acpi/processor.h')
-rw-r--r-- | include/acpi/processor.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 99934a999e66..26d79f6db8a0 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
5 | #include <linux/cpu.h> | 5 | #include <linux/cpu.h> |
6 | #include <linux/cpuidle.h> | ||
6 | 7 | ||
7 | #include <asm/acpi.h> | 8 | #include <asm/acpi.h> |
8 | 9 | ||
@@ -75,7 +76,9 @@ struct acpi_processor_cx { | |||
75 | }; | 76 | }; |
76 | 77 | ||
77 | struct acpi_processor_power { | 78 | struct acpi_processor_power { |
79 | struct cpuidle_device dev; | ||
78 | struct acpi_processor_cx *state; | 80 | struct acpi_processor_cx *state; |
81 | struct acpi_processor_cx *bm_state; | ||
79 | unsigned long bm_check_timestamp; | 82 | unsigned long bm_check_timestamp; |
80 | u32 default_state; | 83 | u32 default_state; |
81 | u32 bm_activity; | 84 | u32 bm_activity; |
@@ -199,6 +202,7 @@ struct acpi_processor_flags { | |||
199 | u8 bm_check:1; | 202 | u8 bm_check:1; |
200 | u8 has_cst:1; | 203 | u8 has_cst:1; |
201 | u8 power_setup_done:1; | 204 | u8 power_setup_done:1; |
205 | u8 bm_rld_set:1; | ||
202 | }; | 206 | }; |
203 | 207 | ||
204 | struct acpi_processor { | 208 | struct acpi_processor { |
@@ -322,6 +326,7 @@ int acpi_processor_power_exit(struct acpi_processor *pr, | |||
322 | struct acpi_device *device); | 326 | struct acpi_device *device); |
323 | int acpi_processor_suspend(struct acpi_device * device, pm_message_t state); | 327 | int acpi_processor_suspend(struct acpi_device * device, pm_message_t state); |
324 | int acpi_processor_resume(struct acpi_device * device); | 328 | int acpi_processor_resume(struct acpi_device * device); |
329 | extern struct cpuidle_driver acpi_idle_driver; | ||
325 | 330 | ||
326 | /* in processor_thermal.c */ | 331 | /* in processor_thermal.c */ |
327 | int acpi_processor_get_limit_info(struct acpi_processor *pr); | 332 | int acpi_processor_get_limit_info(struct acpi_processor *pr); |