Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164307
b: refs/heads/master
c: 6399c08
h: refs/heads/master
i:
  164305: c35dc92
  164303: 42790c9
v: v3
  • Loading branch information
Alok Kataria authored and Ingo Molnar committed Sep 20, 2009
1 parent 51a54b3 commit 5b8851c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bfefb7a0c6e08736f2d5917c468467f134bf28bb
refs/heads/master: 6399c087458859cddff2d6b46befb95b866df3e0
6 changes: 6 additions & 0 deletions trunk/arch/x86/kernel/cpu/vmware.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ static unsigned long vmware_get_tsc_khz(void)
tsc_hz = eax | (((uint64_t)ebx) << 32);
do_div(tsc_hz, 1000);
BUG_ON(tsc_hz >> 32);
printk(KERN_INFO "TSC freq read from hypervisor : %lu.%03lu MHz\n",
(unsigned long) tsc_hz / 1000,
(unsigned long) tsc_hz % 1000);
return tsc_hz;
}

Expand All @@ -69,6 +72,9 @@ void __init vmware_platform_setup(void)

if (ebx != UINT_MAX)
x86_platform.calibrate_tsc = vmware_get_tsc_khz;
else
printk(KERN_WARNING
"Failed to get TSC freq from the hypervisor\n");
}

/*
Expand Down

0 comments on commit 5b8851c

Please sign in to comment.