diff options
Diffstat (limited to 'drivers/kvm/svm.c')
-rw-r--r-- | drivers/kvm/svm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 0feec8558599..3997bbd78fb7 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c | |||
@@ -625,12 +625,11 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu) | |||
625 | kfree(svm); | 625 | kfree(svm); |
626 | } | 626 | } |
627 | 627 | ||
628 | static void svm_vcpu_load(struct kvm_vcpu *vcpu) | 628 | static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) |
629 | { | 629 | { |
630 | struct vcpu_svm *svm = to_svm(vcpu); | 630 | struct vcpu_svm *svm = to_svm(vcpu); |
631 | int cpu, i; | 631 | int i; |
632 | 632 | ||
633 | cpu = get_cpu(); | ||
634 | if (unlikely(cpu != vcpu->cpu)) { | 633 | if (unlikely(cpu != vcpu->cpu)) { |
635 | u64 tsc_this, delta; | 634 | u64 tsc_this, delta; |
636 | 635 | ||
@@ -657,7 +656,6 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu) | |||
657 | wrmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]); | 656 | wrmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]); |
658 | 657 | ||
659 | rdtscll(vcpu->host_tsc); | 658 | rdtscll(vcpu->host_tsc); |
660 | put_cpu(); | ||
661 | } | 659 | } |
662 | 660 | ||
663 | static void svm_vcpu_decache(struct kvm_vcpu *vcpu) | 661 | static void svm_vcpu_decache(struct kvm_vcpu *vcpu) |