summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/kvmclock.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2008-12-05 18:36:45 -0200
committerAvi Kivity <avi@redhat.com>2008-12-31 16:55:44 +0200
commite93353c93a3ba4215633ce930784f40a4e94e3f9 (patch)
treeadb847a71fa51c70b968573d4d5de58d27ca1f9a /arch/x86/kernel/kvmclock.c
parentad218f85e388e8ca816ff09d91c246cd014c53a8 (diff)
downloadblackbird-op-linux-e93353c93a3ba4215633ce930784f40a4e94e3f9.tar.gz
blackbird-op-linux-e93353c93a3ba4215633ce930784f40a4e94e3f9.zip
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: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kernel/kvmclock.c')
-rw-r--r--arch/x86/kernel/kvmclock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index b38e801014e3..652fce6d2cce 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -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);
OpenPOWER on IntegriCloud