diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-26 17:14:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-26 17:14:17 -0800 |
| commit | 7d3a0fa52e4d9fa2cfe04a5f6e21d1d78169edb5 (patch) | |
| tree | 9f34a882b858ff0d9014cbba277defbf0db26489 /include | |
| parent | sysctl: fix proc_doulongvec_ms_jiffies_minmax() (diff) | |
| parent | Merge branches 'pm-sleep' and 'pm-cpufreq' (diff) | |
| download | linux-dev-7d3a0fa52e4d9fa2cfe04a5f6e21d1d78169edb5.tar.xz linux-dev-7d3a0fa52e4d9fa2cfe04a5f6e21d1d78169edb5.zip | |
Merge tag 'pm-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"These fix two regressions introduced recently, one by reverting the
problematic commit and one by fixing up the behavior in an overlooked
case.
Specifics:
- Revert the recent change that caused suspend-to-idle to be used as
the default suspend method on systems where it is indicated to be
efficient by the ACPI tables, as that turned out to be premature
and introduced suspend regressions on some systems with missing
power management support in device drivers (Rafael Wysocki).
- Fix up the intel_pstate driver to take changes of the global limits
via sysfs correctly when the performance policy is used which has
been broken by a recent change in it (Srinivas Pandruvada)"
* tag 'pm-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: intel_pstate: Fix sysfs limits enforcement for performance policy
Revert "PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/suspend.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 0c729c3c8549..d9718378a8be 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -194,8 +194,6 @@ struct platform_freeze_ops { }; #ifdef CONFIG_SUSPEND -extern suspend_state_t mem_sleep_default; - /** * suspend_set_ops - set platform dependent suspend operations * @ops: The new suspend operations to set. |