Commit 664c0d3d authored by Vivek Goyal's avatar Vivek Goyal Committed by Linus Torvalds

[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: default avatarVivek 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9c61a446
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
*/ */
unsigned int tsc_khz; unsigned int tsc_khz;
int tsc_disable __cpuinitdata = 0; int tsc_disable;
#ifdef CONFIG_X86_TSC #ifdef CONFIG_X86_TSC
static int __init tsc_setup(char *str) static int __init tsc_setup(char *str)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment