summaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@in.ibm.com>2007-01-11 10:15:36 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-12 05:18:20 +0300
commit664c0d3d575946bce24ecf5b7f93ee9541e4caf3 (patch)
tree3eaffbdd70005e2b9cf7695f287f20f2cf2b90ac /arch/i386
parent9c61a446a1cab4280404798e335655266c1a4929 (diff)
downloadlinux-664c0d3d575946bce24ecf5b7f93ee9541e4caf3.tar.xz
[PATCH] 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 <vgoyal@in.ibm.com> Cc: Andi Kleen <ak@suse.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/tsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index 1bbe45dca7a0..2cfc7b09b925 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -24,7 +24,7 @@
*/
unsigned int tsc_khz;
-int tsc_disable __cpuinitdata = 0;
+int tsc_disable;
#ifdef CONFIG_X86_TSC
static int __init tsc_setup(char *str)