git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
7e2225d
)
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 15 Jul 2008 23:29:18 +0000
(16:29 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 15 Jul 2008 23:29:18 +0000
(16:29 -0700)
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix TSC build error on 32bit
arch/x86/kernel/tsc.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/tsc.c
b/arch/x86/kernel/tsc.c
index
3c36f92
..
7603c05
100644
(file)
--- a/
arch/x86/kernel/tsc.c
+++ b/
arch/x86/kernel/tsc.c
@@
-358,6
+358,7
@@
static cycle_t read_tsc(void)
ret : clocksource_tsc.cycle_last;
}
+#ifdef CONFIG_X86_64
static cycle_t __vsyscall_fn vread_tsc(void)
{
cycle_t ret = (cycle_t)vget_cycles();
@@
-365,6
+366,7
@@
static cycle_t __vsyscall_fn vread_tsc(void)
return ret >= __vsyscall_gtod_data.clock.cycle_last ?
ret : __vsyscall_gtod_data.clock.cycle_last;
}
+#endif
static struct clocksource clocksource_tsc = {
.name = "tsc",