Prev: [199/200] drm/i915: Dont touch PORT_HOTPLUG_EN in intel_dp_detect()
Next: [194/200] KVM: Fix wallclock version writing race
From: Greg KH on 1 Jul 2010 17:30
2.6.34-stable review patch. If anyone has any objections, please let me know.

------------------

From: Sheng Yang <sheng(a)linux.intel.com>

kvm_x86_ops->set_efer() would execute vcpu->arch.efer = efer, so the
checking of LMA bit didn't work.

Signed-off-by: Sheng Yang <sheng(a)linux.intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

(Cherry-picked from commit a3d204e28579427609c3d15d2310127ebaa47d94)
---
arch/x86/kvm/x86.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -657,11 +657,11 @@ static void set_efer(struct kvm_vcpu *vc
}
}

- kvm_x86_ops->set_efer(vcpu, efer);
-
efer &= ~EFER_LMA;
efer |= vcpu->arch.efer & EFER_LMA;

+ kvm_x86_ops->set_efer(vcpu, efer);
+
vcpu->arch.efer = efer;

vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [199/200] drm/i915: Dont touch PORT_HOTPLUG_EN in intel_dp_detect()
Next: [194/200] KVM: Fix wallclock version writing race