Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal

[sfrench/cifs-2.6.git] / include / asm-x86 / time.h

diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h
index bce72d7a958c21829aa79c041b4ac2fb06178421..3e724eef7ac468f118bb8c7c95edac31577cc739 100644 (file)
--- a/include/asm-x86/time.h
+++ b/include/asm-x86/time.h
@@ -1,5 +1,5 @@
-#ifndef _ASMX86_TIME_H
-#define _ASMX86_TIME_H
+#ifndef ASM_X86__TIME_H
+#define ASM_X86__TIME_H
 
 extern void hpet_time_init(void);
 
@@ -46,6 +46,8 @@ static inline int native_set_wallclock(unsigned long nowtime)
 
 #endif
 
+extern void time_init(void);
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else /* !CONFIG_PARAVIRT */
@@ -56,4 +58,6 @@ static inline int native_set_wallclock(unsigned long nowtime)
 
 #endif /* CONFIG_PARAVIRT */
 
-#endif
+extern unsigned long __init calibrate_cpu(void);
+
+#endif /* ASM_X86__TIME_H */