diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-07 11:36:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-07 11:36:17 -0700 |
| commit | a373ec23ab527c3202eb05e4f9d0eba2d83a7b27 (patch) | |
| tree | 00425c95c7febac592f8eb7bfaf1346dcee64822 /drivers | |
| parent | de9f869616dd95e95c00bdd6b0fcd3421e8a4323 (diff) | |
| parent | a964d23c94e8177c501fc9a37dcf1f0dd2750527 (diff) | |
| download | linux-a373ec23ab527c3202eb05e4f9d0eba2d83a7b27.tar.bz2 | |
Merge tag 'pm-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"These fix a crash during resume from hibernation introduced during the
4.19 cycle, cause the new Performance and Energy Bias Hint (EPB) code
to be built only if CONFIG_PM is set and add a few missing kerneldoc
comments.
Specifics:
- Fix a crash that occurs when a kernel with 'nosmt' in the command
line is used to resume the system from hibernation (as the
"restore" kernel), because memory mapping differences between the
restore and image kernels cause SMT siblings to be woken up from
idle states and subsequently they try to fetch instructions from
incorrect memory locations (Jiri Kosina).
- Cause the new Performance and Energy Bias Hint (EPB) code to be
built only if CONFIG_PM is set, because that code is not really
necessary otherwise (Rafael Wysocki).
- Add kerneldoc comments to documents some helper functions related
to system-wide suspend to avoid possible confusion regarding their
purpose (Rafael Wysocki)"
* tag 'pm-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
x86/power: Fix 'nosmt' vs hibernation triple fault during resume
PM: sleep: Add kerneldoc comments to some functions
x86: intel_epb: Do not build when CONFIG_PM is unset
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions