Merge branch 'pm-sleep'

* pm-sleep: x86: Load __USER_DS into DS/ES after resume
mariux64 · Jun 22, 2015 · 3bcda76 · 3bcda76
2 parents 1af858f + ffa64ef
commit 3bcda76
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
@@ -12,11 +12,13 @@ ENTRY(wakeup_pmode_return)
 wakeup_pmode_return:
 	movw	$__KERNEL_DS, %ax
 	movw	%ax, %ss
-	movw	%ax, %ds
-	movw	%ax, %es
 	movw	%ax, %fs
 	movw	%ax, %gs
 
+	movw	$__USER_DS, %ax
+	movw	%ax, %ds
+	movw	%ax, %es
+
 	# reload the gdt, as we need the full 32 bit address
 	lidt	saved_idt
 	lldt	saved_ldt