Skip to content

Commit

Permalink
KVM: Fix build error due to 64-bit division in nsec_to_cycles()
Browse files Browse the repository at this point in the history
Use do_div() instead.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  • Loading branch information
Avi Kivity committed Oct 24, 2010
1 parent 34d1f49 commit 217fc9c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion arch/x86/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
#include <asm/i387.h>
#include <asm/xcr.h>
#include <asm/pvclock.h>
#include <asm/div64.h>

#define MAX_IO_MSRS 256
#define CR0_RESERVED_BITS \
Expand Down Expand Up @@ -917,11 +918,15 @@ static inline int kvm_tsc_changes_freq(void)

static inline u64 nsec_to_cycles(u64 nsec)
{
u64 ret;

WARN_ON(preemptible());
if (kvm_tsc_changes_freq())
printk_once(KERN_WARNING
"kvm: unreliable cycle conversion on adjustable rate TSC\n");
return (nsec * __get_cpu_var(cpu_tsc_khz)) / USEC_PER_SEC;
ret = nsec * __get_cpu_var(cpu_tsc_khz);
do_div(ret, USEC_PER_SEC);
return ret;
}

void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data)
Expand Down

0 comments on commit 217fc9c

Please sign in to comment.