projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[powerpc.git]
/
include
/
asm-i386
/
time.h
diff --git
a/include/asm-i386/time.h
b/include/asm-i386/time.h
index
571b429
..
eac0113
100644
(file)
--- a/
include/asm-i386/time.h
+++ b/
include/asm-i386/time.h
@@
-28,14
+28,16
@@
static inline int native_set_wallclock(unsigned long nowtime)
return retval;
}
return retval;
}
+extern void (*late_time_init)(void);
+extern void hpet_time_init(void);
+
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
-extern unsigned long long native_sched_clock(void);
#else /* !CONFIG_PARAVIRT */
#define get_wallclock() native_get_wallclock()
#define set_wallclock(x) native_set_wallclock(x)
#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 */
#endif /* CONFIG_PARAVIRT */