KVM: x86: fix compilation

bonzini · bonzini · commit 80fbd89cbd07 · 2017-02-08T10:57:24.000+01:00
Fix rebase breakage from commit 55dd00a ("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>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -6153,7 +6153,7 @@ static int kvm_pv_clock_pairing(struct kvm_vcpu *vcpu, gpa_t paddr,`
`6153`	`6153`	`{`
`6154`	`6154`	`struct kvm_clock_pairing clock_pairing;`
`6155`	`6155`	`struct timespec ts;`
`6156`		`- cycle_t cycle;`
	`6156`	`+ u64 cycle;`
`6157`	`6157`	`int ret;`
`6158`	`6158`
`6159`	`6159`	`if (clock_type != KVM_CLOCK_PAIRING_WALLCLOCK)`