diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /arch/x86/kvm/svm.c | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -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 ab22615eee8..6b0d5fa5bab 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
| @@ -688,7 +688,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 688 | delta = vcpu->arch.host_tsc - tsc_this; | 688 | delta = vcpu->arch.host_tsc - tsc_this; |
| 689 | svm->vmcb->control.tsc_offset += delta; | 689 | svm->vmcb->control.tsc_offset += delta; |
| 690 | vcpu->cpu = cpu; | 690 | vcpu->cpu = cpu; |
| 691 | kvm_migrate_apic_timer(vcpu); | 691 | kvm_migrate_timers(vcpu); |
| 692 | } | 692 | } |
| 693 | 693 | ||
| 694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) | 694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) |