summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/time.h
diff options
context:
space:
mode:
authorAlok Kataria2008-07-01 20:43:34 +0200
committerIngo Molnar2008-07-09 07:43:27 +0200
commit8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 (patch)
tree3b7c8e4ee74ef5fec07f64ea56bff60afb433c2c /include/asm-x86/time.h
parentx86: merge the TSC cpu-freq code (diff)
downloadkernel-qcow2-linux-8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2.tar.gz
kernel-qcow2-linux-8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2.tar.xz
kernel-qcow2-linux-8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2.zip
x86: merge tsc_init and clocksource code
Unify the clocksource code. Unify the tsc_init code. 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 'include/asm-x86/time.h')
-rw-r--r--include/asm-x86/time.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h
index bce72d7a958c..a17fa473e91d 100644
--- a/include/asm-x86/time.h
+++ b/include/asm-x86/time.h
@@ -56,4 +56,6 @@ static inline int native_set_wallclock(unsigned long nowtime)
#endif /* CONFIG_PARAVIRT */
+extern unsigned long __init calibrate_cpu(void);
+
#endif