diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2017-02-08 10:57:24 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-02-08 10:57:24 +0100 |
| commit | 80fbd89cbd07287a7013006c14ddec923b7a4ff6 (patch) | |
| tree | ad6b702ee94a8ba17712bd3d7ac77e99ae940eda /arch/x86/kvm | |
| parent | Merge tag 'kvm-s390-next-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (diff) | |
| download | linux-dev-80fbd89cbd07287a7013006c14ddec923b7a4ff6.tar.xz linux-dev-80fbd89cbd07287a7013006c14ddec923b7a4ff6.zip | |
KVM: x86: fix compilation
Fix rebase breakage from commit 55dd00a73a51 ("KVM: x86: add
KVM_HC_CLOCK_PAIRING hypercall", 2017-01-24), courtesy of the
"I could have sworn I had pushed the right branch" department.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 09e5d31dac98..96dd7dd13ee6 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6153,7 +6153,7 @@ static int kvm_pv_clock_pairing(struct kvm_vcpu *vcpu, gpa_t paddr, { struct kvm_clock_pairing clock_pairing; struct timespec ts; - cycle_t cycle; + u64 cycle; int ret; if (clock_type != KVM_CLOCK_PAIRING_WALLCLOCK) |