]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
KVM: x86: fix compilation
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 8 Feb 2017 09:57:24 +0000 (10:57 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 8 Feb 2017 09:57:24 +0000 (10:57 +0100)
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>
arch/x86/kvm/x86.c

index 09e5d31dac98bffc02015477a3f9b76dda0c2b02..96dd7dd13ee6f58409508af1a804cb1c744198fa 100644 (file)
@@ -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)