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

…t/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
mariux64 · Feb 12, 2011 · 3c6c0d6 · 3c6c0d6
2 parents 5b49378 + 893a5ab
commit 3c6c0d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
@@ -1150,8 +1150,8 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)
 	kvm_load_ldt(svm->host.ldt);
 #ifdef CONFIG_X86_64
 	loadsegment(fs, svm->host.fs);
-	load_gs_index(svm->host.gs);
 	wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs);
+	load_gs_index(svm->host.gs);
 #else
 	loadsegment(gs, svm->host.gs);
 #endif