Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e93353c9 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Avi Kivity
Browse files

x86: KVM guest: kvm_get_tsc_khz: return khz, not lpj 



kvm_get_tsc_khz() currently returns the previously-calculated preset_lpj
value, but it is in loops-per-jiffy, not kHz. The current code works
correctly only when HZ=1000.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent ad218f85

arch/x86/kernel/kvmclock.c

+4 −4
Original line number Diff line number Diff line
@@ -89,17 +89,17 @@ static cycle_t kvm_clock_read(void) 
 */

static unsigned long kvm_get_tsc_khz(void)

{

	return preset_lpj;

	struct pvclock_vcpu_time_info *src;

	src = &per_cpu(hv_clock, 0);

	return pvclock_tsc_khz(src);

}



static void kvm_get_preset_lpj(void)

{

	struct pvclock_vcpu_time_info *src;

	unsigned long khz;

	u64 lpj;



	src = &per_cpu(hv_clock, 0);

	khz = pvclock_tsc_khz(src);

	khz = kvm_get_tsc_khz();



	lpj = ((u64)khz * 1000);

	do_div(lpj, HZ);