* [PATCH] kvm_get_tsc_khz: return khz, not lpj
@ 2008-12-05 20:36 Eduardo Habkost
2008-12-07 9:41 ` Avi Kivity
0 siblings, 1 reply; 2+ messages in thread
From: Eduardo Habkost @ 2008-12-05 20:36 UTC (permalink / raw)
To: Avi Kivity; +Cc: Glauber Costa, kvm
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>
---
arch/x86/kernel/kvmclock.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index b38e801..652fce6 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);
--
1.5.5.GIT
--
Eduardo
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] kvm_get_tsc_khz: return khz, not lpj
2008-12-05 20:36 [PATCH] kvm_get_tsc_khz: return khz, not lpj Eduardo Habkost
@ 2008-12-07 9:41 ` Avi Kivity
0 siblings, 0 replies; 2+ messages in thread
From: Avi Kivity @ 2008-12-07 9:41 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: Glauber Costa, kvm
Eduardo Habkost wrote:
> 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.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-12-07 9:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-05 20:36 [PATCH] kvm_get_tsc_khz: return khz, not lpj Eduardo Habkost
2008-12-07 9:41 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).