diff options
author | Satyam Sharma <satyam@infradead.org> | 2007-10-17 12:04:33 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:15:25 -0400 |
commit | 25d1b5167780c7f245d9655d302f6a3d8bf61d19 (patch) | |
tree | 4d14c984208b94a700958e0daa23b24c1ec44e5d | |
parent | 58d5fa7a6a6fc4754d295d0999b284edd67c8620 (diff) |
i386: Fix section mismatch
Fix bugzilla #8679
WARNING: arch/i386/kernel/built-in.o(.data+0x2148): Section mismatch: reference
to .init.text: (between 'thermal_throttle_cpu_notifier' and 'mtrr_mutex')
comes because struct notifier_block thermal_throttle_cpu_notifier in
arch/i386/kernel/cpu/mcheck/therm_throt.c goes in .data section but the
notifier callback function itself has been marked __cpuinit which becomes
__init == .init.text when HOTPLUG_CPU=n. The warning is bogus because the
callback will never be called out if HOTPLUG_CPU=n in the first place (as
one can see from kernel/cpu.c, the cpu_chain itself is __cpuinitdata :-)
So, let's mark thermal_throttle_cpu_notifier as __cpuinitdata to fix
the section mismatch warning.
[ tglx: arch/x86 adaptation ]
Signed-off-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index 1203dc5ab87a..494d320d909b 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c | |||
@@ -152,7 +152,7 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb, | |||
152 | return NOTIFY_OK; | 152 | return NOTIFY_OK; |
153 | } | 153 | } |
154 | 154 | ||
155 | static struct notifier_block thermal_throttle_cpu_notifier = | 155 | static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata = |
156 | { | 156 | { |
157 | .notifier_call = thermal_throttle_cpu_callback, | 157 | .notifier_call = thermal_throttle_cpu_callback, |
158 | }; | 158 | }; |