* pm-sleep: Revert "PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag" * pm-cpufreq: cpufreq: intel_pstate: Fix sysfs limits enforcement for performance policy
Showing the changes to kernel (1 of 5 files). Show all
Unified · Split
| @@ -46,7 +46,7 @@ static const char * const mem_sleep_labels[] = { · 45 unmodified lines | ||
| 46 | 46 | const char *mem_sleep_states[PM_SUSPEND_MAX]; |
| 47 | 47 | |
| 48 | 48 | suspend_state_t mem_sleep_current = PM_SUSPEND_FREEZE; |
| 49 | −suspend_state_t mem_sleep_default = PM_SUSPEND_MAX; | |
| 49 | +static suspend_state_t mem_sleep_default = PM_SUSPEND_MEM; | |
| 50 | 50 | |
| 51 | 51 | unsigned int pm_suspend_global_flags; |
| 52 | 52 | EXPORT_SYMBOL_GPL(pm_suspend_global_flags); |
| @@ -168,7 +168,7 @@ void suspend_set_ops(const struct platform_suspend_ops *ops) · 115 unmodified lines | ||
| 168 | 168 | } |
| 169 | 169 | if (valid_state(PM_SUSPEND_MEM)) { |
| 170 | 170 | mem_sleep_states[PM_SUSPEND_MEM] = mem_sleep_labels[PM_SUSPEND_MEM]; |
| 171 | − if (mem_sleep_default >= PM_SUSPEND_MEM) | |
| 171 | + if (mem_sleep_default == PM_SUSPEND_MEM) | |
| 172 | 172 | mem_sleep_current = PM_SUSPEND_MEM; |
| 173 | 173 | } |
| 174 | 174 | |