diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-12 18:16:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-12 18:16:01 +0200 |
| commit | 0acc1b2afb6ded060b7d6b1b5e6ac8a00ec47547 (patch) | |
| tree | 775942bcb62c49f54d606b9d6d16c4577df607b1 | |
| parent | fanotify: disable fanotify syscalls (diff) | |
| parent | KVM: x86: Move TSC reset out of vmcb_init (diff) | |
| download | linux-0acc1b2afb6ded060b7d6b1b5e6ac8a00ec47547.tar.xz linux-0acc1b2afb6ded060b7d6b1b5e6ac8a00ec47547.zip | |
Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: Move TSC reset out of vmcb_init
KVM: x86: Fix SVM VMCB reset
| -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 bc5b9b8d4a33..81ed28cb36e6 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -766,7 +766,6 @@ static void init_vmcb(struct vcpu_svm *svm) control->iopm_base_pa = iopm_base; control->msrpm_base_pa = __pa(svm->msrpm); - control->tsc_offset = 0; control->int_ctl = V_INTR_MASKING_MASK; init_seg(&save->es); @@ -902,6 +901,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) svm->vmcb_pa = page_to_pfn(page) << PAGE_SHIFT; svm->asid_generation = 0; init_vmcb(svm); + svm->vmcb->control.tsc_offset = 0-native_read_tsc(); err = fx_init(&svm->vcpu); if (err) |