diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-12 01:30:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-12 01:30:09 +0100 |
| commit | 3c6c0d6ca386fe7a8e44e887a51f333c2499c829 (patch) | |
| tree | d502ba0de5d3dacb5098d677734fe2ccabd6b113 /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
| parent | KVM: SVM: Make sure KERNEL_GS_BASE is valid when loading gs_index (diff) | |
| download | linux-3c6c0d6ca386fe7a8e44e887a51f333c2499c829.tar.xz linux-3c6c0d6ca386fe7a8e44e887a51f333c2499c829.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/svm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 25bd1bc5aad2..54ce246a383e 100644 --- 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 |