2007-01-08 08:11:41

by Vivek Goyal

[permalink] [raw]
Subject: [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'

Signed-off-by: Vivek Goyal <[email protected]>
---

arch/i386/kernel/tsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/i386/kernel/tsc.c~sched_clock-using-init-data-tsc_disable-fix arch/i386/kernel/tsc.c
--- linux-2.6.20-rc2-mm1-reloc/arch/i386/kernel/tsc.c~sched_clock-using-init-data-tsc_disable-fix 2007-01-08 09:23:13.000000000 +0530
+++ linux-2.6.20-rc2-mm1-reloc-root/arch/i386/kernel/tsc.c 2007-01-08 09:23:48.000000000 +0530
@@ -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)
_