diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:17:50 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:17:50 +0200 |
| commit | 28c399e2a1ed03bd175858deef1e233317103089 (patch) | |
| tree | 4e87f75cb4d6d52668030e36b5d000e80eb5e5d3 /include/linux/pm.h | |
| parent | 0ede470030a35847a8b213bbdafb29d77bca76da (diff) | |
| parent | a8d46b9e4e487301affe84fa53de40b890898604 (diff) | |
| download | linux-28c399e2a1ed03bd175858deef1e233317103089.tar.gz linux-28c399e2a1ed03bd175858deef1e233317103089.tar.bz2 linux-28c399e2a1ed03bd175858deef1e233317103089.zip | |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
PM / sleep: Rename platform suspend/resume functions in suspend.c
PM / sleep: Export dpm_suspend_late/noirq() and dpm_resume_early/noirq()
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 72c0fe098a27..e1c00b7ee913 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -679,12 +679,16 @@ struct dev_pm_domain { extern void device_pm_lock(void); extern void dpm_resume_start(pm_message_t state); extern void dpm_resume_end(pm_message_t state); +extern void dpm_resume_noirq(pm_message_t state); +extern void dpm_resume_early(pm_message_t state); extern void dpm_resume(pm_message_t state); extern void dpm_complete(pm_message_t state); extern void device_pm_unlock(void); extern int dpm_suspend_end(pm_message_t state); extern int dpm_suspend_start(pm_message_t state); +extern int dpm_suspend_noirq(pm_message_t state); +extern int dpm_suspend_late(pm_message_t state); extern int dpm_suspend(pm_message_t state); extern int dpm_prepare(pm_message_t state); |