Thread (9 messages) 9 messages, 5 authors, 2015-06-22

Re: [PATCH v2] x86: Load __USER_DS into DS/ES after resume

From: Pavel Machek <hidden>
Date: 2015-06-16 09:13:36

quoted
That second KERNEL should be USER.
Yeah, doh :-/ Updated patch below.

Thanks,

	Ingo
Acked-by: Pavel Machek <redacted>
Tested-by: Pavel Machek <redacted>

[of course, it worked for me before, so I only tested it also works
with the patch.]

Rafael, can you apply it?
									Pavel

quoted hunk ↗ jump to hunk
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
index 665c6b7d2ea9..0c26b1b44e51 100644
--- 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
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help