diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-02 12:02:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-02 12:02:28 +1100 |
| commit | a512f8d6457e9a48dd2db43ef8078b739af4a57d (patch) | |
| tree | 96aebf1d500421d4d42aed211272e4878470f6ad | |
| parent | d6febf57b7ca343055b913df5f6d1d910a27e49f (diff) | |
| parent | 2d5a857b6090188638b1cc673c2dd3dbf8937e91 (diff) | |
Merge remote branch 'kvm/linux-next'
| -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 |