diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-06 15:54:47 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-06 15:54:47 +0300 |
| commit | 69a10ca747c2d2d7c0354a883335e097c067ed35 (patch) | |
| tree | a8b1f56f95af55a4d9bd826b7e5e6d31b8cd6b98 /include/linux | |
| parent | 96428e98aebe5db8a164711f102808651c7f518d (diff) | |
| parent | a192aa923b66a435aae56983c4912ee150bc9b32 (diff) | |
| download | linux-69a10ca747c2d2d7c0354a883335e097c067ed35.tar.xz | |
Merge branch 'acpi-pm' into pm-core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 12 | ||||
| -rw-r--r-- | include/linux/pm_qos.h | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d18c92d4ba19..0ada2a948b44 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -864,7 +864,7 @@ static inline void arch_reserve_mem_area(acpi_physical_address addr, #endif #if defined(CONFIG_ACPI) && defined(CONFIG_PM) -int acpi_dev_runtime_suspend(struct device *dev); +int acpi_dev_suspend(struct device *dev, bool wakeup); int acpi_dev_resume(struct device *dev); int acpi_subsys_runtime_suspend(struct device *dev); int acpi_subsys_runtime_resume(struct device *dev); @@ -889,7 +889,6 @@ int acpi_subsys_resume_early(struct device *dev); int acpi_subsys_suspend(struct device *dev); int acpi_subsys_freeze(struct device *dev); #else -static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } static inline int acpi_dev_resume_early(struct device *dev) { return 0; } static inline int acpi_subsys_prepare(struct device *dev) { return 0; } static inline void acpi_subsys_complete(struct device *dev) {} @@ -1248,4 +1247,13 @@ int acpi_irq_get(acpi_handle handle, unsigned int index, struct resource *res) } #endif +#ifdef CONFIG_ACPI_LPIT +int lpit_read_residency_count_address(u64 *address); +#else +static inline int lpit_read_residency_count_address(u64 *address) +{ + return -EINVAL; +} +#endif + #endif /*_LINUX_ACPI_H*/ diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 032b55909145..51f0d7e0b15f 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -39,7 +39,6 @@ enum pm_qos_flags_status { #define PM_QOS_LATENCY_ANY ((s32)(~(__u32)0 >> 1)) #define PM_QOS_FLAG_NO_POWER_OFF (1 << 0) -#define PM_QOS_FLAG_REMOTE_WAKEUP (1 << 1) struct pm_qos_request { struct plist_node node; |