diff options
author | Alok Kataria <akataria@vmware.com> | 2008-07-01 14:43:36 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 01:43:28 -0400 |
commit | e93ef949fd9a3f237aedfb8e64414b28980530b8 (patch) | |
tree | 4856aa8bf0e02ed1692fe7b4f545c52cdc1705a3 /arch/x86/lguest | |
parent | 8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 (diff) |
x86: rename paravirtualized TSC functions
Rename the paravirtualized calculate_cpu_khz to calibrate_tsc.
In all cases, we actually calibrate_tsc and use that as the cpu_khz value.
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Dan Hecht <dhecht@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lguest')
-rw-r--r-- | arch/x86/lguest/boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index e72cf0793fbe..50dad44fb542 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -607,7 +607,7 @@ static unsigned long lguest_get_wallclock(void) | |||
607 | * what speed it runs at, or 0 if it's unusable as a reliable clock source. | 607 | * what speed it runs at, or 0 if it's unusable as a reliable clock source. |
608 | * This matches what we want here: if we return 0 from this function, the x86 | 608 | * This matches what we want here: if we return 0 from this function, the x86 |
609 | * TSC clock will give up and not register itself. */ | 609 | * TSC clock will give up and not register itself. */ |
610 | static unsigned long lguest_cpu_khz(void) | 610 | static unsigned long lguest_tsc_khz(void) |
611 | { | 611 | { |
612 | return lguest_data.tsc_khz; | 612 | return lguest_data.tsc_khz; |
613 | } | 613 | } |
@@ -998,7 +998,7 @@ __init void lguest_init(void) | |||
998 | /* time operations */ | 998 | /* time operations */ |
999 | pv_time_ops.get_wallclock = lguest_get_wallclock; | 999 | pv_time_ops.get_wallclock = lguest_get_wallclock; |
1000 | pv_time_ops.time_init = lguest_time_init; | 1000 | pv_time_ops.time_init = lguest_time_init; |
1001 | pv_time_ops.get_cpu_khz = lguest_cpu_khz; | 1001 | pv_time_ops.get_tsc_khz = lguest_tsc_khz; |
1002 | 1002 | ||
1003 | /* Now is a good time to look at the implementations of these functions | 1003 | /* Now is a good time to look at the implementations of these functions |
1004 | * before returning to the rest of lguest_init(). */ | 1004 | * before returning to the rest of lguest_init(). */ |