summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/vmware.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 15:06:25 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2009-08-31 07:35:47 (GMT)
commit2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78 (patch)
tree7db2dc0fbde3a25a89f1fc1514152567f612ccde /arch/x86/include/asm/vmware.h
parent47926214d8b2bef13b2be57c500194a804f16198 (diff)
downloadlinux-2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78.tar.xz
x86: Move tsc_calibration to x86_init_ops
TSC calibration is modified by the vmware hypervisor and paravirt by separate means. Moorestown wants to add its own calibration routine as well. So make calibrate_tsc a proper x86_init_ops function and override it by paravirt or by the early setup of the vmware hypervisor. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/vmware.h')
-rw-r--r--arch/x86/include/asm/vmware.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/vmware.h b/arch/x86/include/asm/vmware.h
index c11b7e1..e49ed6d 100644
--- a/arch/x86/include/asm/vmware.h
+++ b/arch/x86/include/asm/vmware.h
@@ -20,7 +20,7 @@
#ifndef ASM_X86__VMWARE_H
#define ASM_X86__VMWARE_H
-extern unsigned long vmware_get_tsc_khz(void);
+extern void vmware_platform_setup(void);
extern int vmware_platform(void);
extern void vmware_set_feature_bits(struct cpuinfo_x86 *c);