[GIT PULL] Power management fixes for v5.2-rc4
From: Rafael J. Wysocki
Date: Fri Jun 07 2019 - 05:20:13 EST
Please pull from the tag
with top-most commit a964d23c94e8177c501fc9a37dcf1f0dd2750527
Merge branch 'pm-x86'
on top of commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a
to receive power management fixes for 5.2-rc4.
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
- 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).
Jiri Kosina (1):
x86/power: Fix 'nosmt' vs hibernation triple fault during resume
Rafael J. Wysocki (2):
x86: intel_epb: Do not build when CONFIG_PM is unset
PM: sleep: Add kerneldoc comments to some functions
arch/x86/kernel/cpu/Makefile | 5 ++++-
arch/x86/kernel/cpu/intel_epb.c | 22 +---------------------
arch/x86/power/cpu.c | 10 ++++++++++
arch/x86/power/hibernate.c | 33 +++++++++++++++++++++++++++++++++
include/linux/cpu.h | 4 ++++
include/linux/suspend.h | 31 +++++++++++++++++++++++++++++++
kernel/cpu.c | 4 ++--
kernel/power/hibernate.c | 9 +++++++++
kernel/power/suspend.c | 6 ++++++
9 files changed, 100 insertions(+), 24 deletions(-)