Skip to contentSkip to conversation

kvm_get_tsc_khz: return khz, not lpj

PATCH Applied Eduardo Habkost 2 participants 2 messages Dec 5, 2008 – Dec 7, 2008

Subsystems (3)
x86 KVM KVM paravirt
lore
Share & tools
lore

Eduardo Habkost

author
#0 lore raw

PATCH 1/1 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 Eduardo Habkost <[email protected]>
---
 arch/x86/kernel/kvmclock.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/kvmclock.c +4 -4
index b38e801..652fce6 100644
@@ -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);
Signature · 4 lines
1.5.5.GIT

-- 
Eduardo
Applied
#1 lore raw
Quoted 4 lines · Eduardo Habkost

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.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function