Explorar o código

x86: fix TSC build error on 32bit

Dave Hansen reported a build error on 32bit which went unnoticed
as newer gcc versions seem to optimize unused static functions
away before compiling them.

Make vread_tsc() depend on CONFIG_X86_64

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Thomas Gleixner %!s(int64=17) %!d(string=hai) anos
pai
achega
431ceb83f7
Modificáronse 1 ficheiros con 2 adicións e 0 borrados
  1. 2 0
      arch/x86/kernel/tsc.c

+ 2 - 0
arch/x86/kernel/tsc.c

@@ -358,6 +358,7 @@ static cycle_t read_tsc(void)
 		ret : clocksource_tsc.cycle_last;
 		ret : clocksource_tsc.cycle_last;
 }
 }
 
 
+#ifdef CONFIG_X86_64
 static cycle_t __vsyscall_fn vread_tsc(void)
 static cycle_t __vsyscall_fn vread_tsc(void)
 {
 {
 	cycle_t ret = (cycle_t)vget_cycles();
 	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 ?
 	return ret >= __vsyscall_gtod_data.clock.cycle_last ?
 		ret : __vsyscall_gtod_data.clock.cycle_last;
 		ret : __vsyscall_gtod_data.clock.cycle_last;
 }
 }
+#endif
 
 
 static struct clocksource clocksource_tsc = {
 static struct clocksource clocksource_tsc = {
 	.name                   = "tsc",
 	.name                   = "tsc",