aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-15 07:26:04 +0000
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-08-15 07:26:04 +0000
commit1f5e0290a0710777e9d618f043f39bd24863fb6f (patch)
tree4dc2de05abba38abd028b47ea5e6420f462e41cd
parent548200e018bf07273568526ac8746273abb1c754 (diff)
downloadxen-1f5e0290a0710777e9d618f043f39bd24863fb6f.tar.gz
xen-1f5e0290a0710777e9d618f043f39bd24863fb6f.tar.bz2
xen-1f5e0290a0710777e9d618f043f39bd24863fb6f.zip
Fix cpu_khz reporting in XenLinux.
Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r--linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
index 6b2fe1ccc5..ea421f080b 100644
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
@@ -206,9 +206,9 @@ void init_cpu_khz(void)
struct vcpu_time_info *info = &HYPERVISOR_shared_info->vcpu_time[0];
do_div(__cpu_khz, info->tsc_to_system_mul);
if ( info->tsc_shift < 0 )
- cpu_khz = __cpu_khz >> -info->tsc_shift;
+ cpu_khz = __cpu_khz << -info->tsc_shift;
else
- cpu_khz = __cpu_khz << info->tsc_shift;
+ cpu_khz = __cpu_khz >> info->tsc_shift;
}
static u64 get_nsec_offset(struct shadow_time_info *shadow)