Commit 3c6c0d6c authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Make sure KERNEL_GS_BASE is valid when loading gs_index
parents 5b49378e 893a5ab6
...@@ -1150,8 +1150,8 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu) ...@@ -1150,8 +1150,8 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)
kvm_load_ldt(svm->host.ldt); kvm_load_ldt(svm->host.ldt);
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
loadsegment(fs, svm->host.fs); loadsegment(fs, svm->host.fs);
load_gs_index(svm->host.gs);
wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs); wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs);
load_gs_index(svm->host.gs);
#else #else
loadsegment(gs, svm->host.gs); loadsegment(gs, svm->host.gs);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment