tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 0acc1b2a 7c534773

+1 -1
+1 -1
arch/x86/kvm/svm.c
··· 766 766 767 767 control->iopm_base_pa = iopm_base; 768 768 control->msrpm_base_pa = __pa(svm->msrpm); 769 - control->tsc_offset = 0; 770 769 control->int_ctl = V_INTR_MASKING_MASK; 771 770 772 771 init_seg(&save->es); ··· 901 902 svm->vmcb_pa = page_to_pfn(page) << PAGE_SHIFT; 902 903 svm->asid_generation = 0; 903 904 init_vmcb(svm); 905 + svm->vmcb->control.tsc_offset = 0-native_read_tsc(); 904 906 905 907 err = fx_init(&svm->vcpu); 906 908 if (err)