diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-14 15:12:10 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-14 15:12:10 +0200 |
| commit | c01782d8190cf89c0642b2246caa17c27be0c54a (patch) | |
| tree | 7b2bca5ea7d96b8b7af58458af0727b92f1efa89 /include/acpi/processor.h | |
| parent | d5a2fa27ecd772b51d93a91209205ec4d6ea2da1 (diff) | |
| parent | 0ab5bb64937d76c660c29813d8de0f4b47bf7550 (diff) | |
Merge branch 'acpi-fixes'
* acpi-fixes:
ACPI / AC: Add sleep quirk for Thinkpad e530
ACPI / EC: Restart transaction even when the IBF flag set
ACPI video: ignore BIOS initial backlight value for HP 1000
ACPI: Fix section to __init. Align with usage in acpixf.h
ACPI / PM: Move processor suspend/resume to syscore_ops
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index b327b5a9296..ea69367fdd3 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -329,10 +329,16 @@ int acpi_processor_power_init(struct acpi_processor *pr); int acpi_processor_power_exit(struct acpi_processor *pr); int acpi_processor_cst_has_changed(struct acpi_processor *pr); int acpi_processor_hotplug(struct acpi_processor *pr); -int acpi_processor_suspend(struct device *dev); -int acpi_processor_resume(struct device *dev); extern struct cpuidle_driver acpi_idle_driver; +#ifdef CONFIG_PM_SLEEP +void acpi_processor_syscore_init(void); +void acpi_processor_syscore_exit(void); +#else +static inline void acpi_processor_syscore_init(void) {} +static inline void acpi_processor_syscore_exit(void) {} +#endif + /* in processor_thermal.c */ int acpi_processor_get_limit_info(struct acpi_processor *pr); extern const struct thermal_cooling_device_ops processor_cooling_ops; |