summaryrefslogtreecommitdiffstats
path: root/arch/x86/power
diff options
context:
space:
mode:
authorZhimin Gu <kookoo.gu@intel.com>2018-09-21 14:28:41 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-10-03 11:56:34 +0200
commit1fca4ba0b14d79e8a43822f7b0c7288efba4c9fa (patch)
treedd135d88a1c3f63f96910c294afe04f0d9fa57fb /arch/x86/power
parent5331d2c7efbccab436aa11639d7fa00a1d58abe2 (diff)
downloadlinux-0-day-1fca4ba0b14d79e8a43822f7b0c7288efba4c9fa.tar.gz
linux-0-day-1fca4ba0b14d79e8a43822f7b0c7288efba4c9fa.tar.xz
x86-32, hibernate: Adjust in_suspend after resumed on 32bit system
Update the in_suspend variable to reflect the actual hibernation status. Back-port from 64bit system. Signed-off-by: Zhimin Gu <kookoo.gu@intel.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Chen Yu <yu.c.chen@intel.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/power')
-rw-r--r--arch/x86/power/hibernate_asm_32.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S
index 01f653fae7bd4..6fe383002125f 100644
--- a/arch/x86/power/hibernate_asm_32.S
+++ b/arch/x86/power/hibernate_asm_32.S
@@ -103,5 +103,8 @@ ENTRY(restore_registers)
xorl %eax, %eax
+ /* tell the hibernation core that we've just restored the memory */
+ movl %eax, in_suspend
+
ret
ENDPROC(restore_registers)