From: Avi Kivity <avi@qumranet.com>
Date: Mon, 12 Feb 2007 08:54:40 +0000 (-0800)
Subject: [PATCH] kvm: VMX: Reload ds and es even in 64-bit mode
X-Git-Tag: v2.6.21-rc1~274^2~55
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=26bb83a755593a53bd248e20d699b0c813f1e238;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index e152caa9d9f..407862825c1 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1865,9 +1865,7 @@ again:
 	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: