2 files changed, 6 insertions, 3 deletions

diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h
index 1e4226a85263..f8319cae2ac5 100644
--- a/include/asm-i386/paravirt.h
+++ b/include/asm-i386/paravirt.h
@@ -186,9 +186,9 @@ static inline int set_wallclock(unsigned long nowtime)
         return paravirt_ops.set_wallclock(nowtime);
 }
 
-static inline void do_time_init(void)
+static inline void (*choose_time_init(void))(void)
 {
-        return paravirt_ops.time_init();
+        return paravirt_ops.time_init;
 }
 
 /* The paravirtualized CPUID instruction. */
diff --git a/include/asm-i386/time.h b/include/asm-i386/time.h
index ea8065af825a..eac011366dc2 100644
--- a/include/asm-i386/time.h
+++ b/include/asm-i386/time.h
@@ -28,13 +28,16 @@ static inline int native_set_wallclock(unsigned long nowtime)
         return retval;
 }
 
+extern void (*late_time_init)(void);
+extern void hpet_time_init(void);
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else /* !CONFIG_PARAVIRT */
 
 #define get_wallclock() native_get_wallclock()
 #define set_wallclock(x) native_set_wallclock(x)
-#define do_time_init() time_init_hook()
+#define choose_time_init() hpet_time_init
 
 #endif /* CONFIG_PARAVIRT */