diff options
author | Alok Kataria <akataria@vmware.com> | 2008-07-01 18:43:34 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 05:43:27 (GMT) |
commit | 8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 (patch) | |
tree | 3b7c8e4ee74ef5fec07f64ea56bff60afb433c2c /include/asm-x86/time.h | |
parent | 2dbe06faf37b39f9ecffc054dd173b2a1dc2adcd (diff) | |
download | linux-8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2.tar.xz |
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.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h index bce72d7..a17fa47 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 |