git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[sfrench/cifs-2.6.git]
/
include
/
asm-i386
/
time.h
diff --git
a/include/asm-i386/time.h
b/include/asm-i386/time.h
index ea8065af825a998654e23a92ffc18e60f34885ec..571b4294dc2e84d4029120fd05853a5fa62153ac 100644
(file)
--- a/
include/asm-i386/time.h
+++ b/
include/asm-i386/time.h
@@
-30,6
+30,7
@@
static inline int native_set_wallclock(unsigned long nowtime)
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
+extern unsigned long long native_sched_clock(void);
#else /* !CONFIG_PARAVIRT */
#define get_wallclock() native_get_wallclock()