summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 16:29:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 16:29:18 -0700
commitfafa3a3f16723997f039a0193997464d66dafd8f (patch)
treedd7e93c8bde2b8ac8ec67f3f8302f8ddf4ec9c43
parent7e2225d860772aaa07e1cebca6a5aa6f93f9aa91 (diff)
parent431ceb83f703a343bdd14350480a2224fa4bfedf (diff)
downloadop-kernel-dev-fafa3a3f16723997f039a0193997464d66dafd8f.zip
op-kernel-dev-fafa3a3f16723997f039a0193997464d66dafd8f.tar.gz
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix TSC build error on 32bit
-rw-r--r--arch/x86/kernel/tsc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 3c36f92..7603c05 100644
--- 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",
OpenPOWER on IntegriCloud