commit 26bb83a755593a53bd248e20d699b0c813f1e238
author Avi Kivity <avi@qumranet.com> Mon Feb 12 00:54:40 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Feb 12 09:48:40 2007 -0800
tree 8ab2636e03593fe7dd6149aaaae4997fc71a44cd
parent 54810342f1372afdaf6cb9a6aea0c35df187db12

[PATCH] kvm: VMX: Reload ds and es even in 64-bit mode

Or 32-bit userspace will get confused.

Signed-off-by: Avi Kivity <avi@qumranet.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/kvm/vmx.c

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index e152caa..4078628 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1865,9 +1865,7 @@
 	fx_restore(vcpu->host_fx_image);
 	vcpu->interrupt_window_open = (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & 3) == 0;
 
-#ifndef CONFIG_X86_64
 	asm ("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
-#endif
 
 	/*
 	 * Profile KVM exit RIPs: