Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kerne…

…l/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
mariux64 · Jul 15, 2008 · fafa3a3 · fafa3a3
2 parents 7e2225d + 431ceb8
commit fafa3a3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
@@ -358,13 +358,15 @@ 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();
 
 	return ret >= __vsyscall_gtod_data.clock.cycle_last ?
 		ret : __vsyscall_gtod_data.clock.cycle_last;
 }
+#endif
 
 static struct clocksource clocksource_tsc = {
 	.name                   = "tsc",