Skip to contentSkip to conversation

i386: sched_clock using init data tsc_disable fix

PATCH In review Vivek Goyal 1 participant 1 message Jan 8, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 3/4 i386: sched_clock using init data tsc_disable fix

o sched_clock() a non-init function is using init data tsc_disable. This is flagged by MODPOST on i386 if CONFIG_RELOCATABLE=y

WARNING: vmlinux - Section mismatch: reference to .init.data:tsc_disable from .text between 'sched_clock' (at offset 0xc0109d58) and 'tsc_update_callback'

---

 arch/i386/kernel/tsc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/i386/kernel/tsc.c renamed from arch/i386/kernel/tsc.c~sched_clock-using-init-data-tsc_disable-fix +1 -1
diff -puN arch/i386/kernel/tsc.c~sched_clock-using-init-data-tsc_disable-fix arch/i386/kernel/tsc.c
@@ -26,7 +26,7 @@
 unsigned int tsc_khz;
 unsigned long long (*custom_sched_clock)(void);
 
-int tsc_disable __cpuinitdata = 0;
+int tsc_disable = 0;
 
 #ifdef CONFIG_X86_TSC
 static int __init tsc_setup(char *str)

_