diff options
| author | NeilBrown <neilb@suse.de> | 2012-08-01 20:40:02 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-08-01 20:40:02 +1000 |
| commit | bb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch) | |
| tree | 191bc24dd97bcb174535cc217af082f16da3b43d /include/acpi/processor.h | |
| parent | d57368afe63b3b7b45ce6c2b8c5276417935be2f (diff) | |
| parent | c039c332f23e794deb6d6f37b9f07ff3b27fb2cf (diff) | |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 9d650476d5d..64ec644808b 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -59,10 +59,7 @@ struct acpi_processor_cx { u8 entry_method; u8 index; u32 latency; - u32 latency_ticks; u32 power; - u32 usage; - u64 time; u8 bm_sts_skip; char desc[ACPI_CX_DESC_LEN]; }; @@ -334,8 +331,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr); int acpi_processor_hotplug(struct acpi_processor *pr); int acpi_processor_power_exit(struct acpi_processor *pr, struct acpi_device *device); -int acpi_processor_suspend(struct acpi_device * device, pm_message_t state); -int acpi_processor_resume(struct acpi_device * device); +int acpi_processor_suspend(struct device *dev); +int acpi_processor_resume(struct device *dev); extern struct cpuidle_driver acpi_idle_driver; /* in processor_thermal.c */ |