i386: fix section mismatch warning in intel.c
PATCH 1/1 i386: fix section mismatch warning in intel.c
Fix following section mismatch warning:
WARNING: vmlinux.o(.text+0xc88c): Section mismatch: reference to .init.text:trap_init_f00f_bug (between 'init_intel' and 'cpuid4_cache_lookup')
init_intel are __cpuint where trap_init_f00f_bug is __init. Fixed by declaring trap_init_f00f_bug __cpuinit.
Moved the defintion of trap_init_f00f_bug to the sole user in init.c so the ugly prototype in intel.c could get killed.
Frank van Maarseveen <[email protected]> supplied the .config used to reproduce the warning.
Cc Frank van Maarseveen <[email protected]>
Signed-off-by Sam Ravnborg <[email protected]>
---
arch/i386/kernel/cpu/intel.c +15 -2
@@ -8,6 +8,7 @@#include <linux/module.h> #include <asm/processor.h> +#include <asm/pgtable.h> #include <asm/msr.h> #include <asm/uaccess.h>
@@ -19,8 +20,6 @@#include <mach_apic.h> #endif -extern int trap_init_f00f_bug (void ); -#ifdef CONFIG_X86_INTEL_USERCOPY /* * Alignment at which movsl is preferred for bulk memory copies.
@@ -95,6 +94,20 @@ static int __cpuinit num_cpu_cores(struct cpuinfo_x86 *c)return 1 ; } +#ifdef CONFIG_X86_F00F_BUG +static void __cpuinit trap_init_f00f_bug (void ) +{ +__set_fixmap (FIX_F00F_IDT ,__pa (&idt_table),PAGE_KERNEL_RO ); + +/* +* Update the IDT descriptor and reload the IDT so that +* it uses the read-only mapped virtual address. +*/ + idt_descr.address =fix_to_virt (FIX_F00F_IDT ); +load_idt (&idt_descr); +} +#endif +static void __cpuinit init_intel (struct cpuinfo_x86 *c) {unsigned int l2 =0 ;
arch/i386/kernel/traps.c +0 -14
@@ -1114,20 +1114,6 @@ asmlinkage void math_emulate(long arg)#endif /* CONFIG_MATH_EMULATION */ -#ifdef CONFIG_X86_F00F_BUG -void __init trap_init_f00f_bug (void ) -{ -__set_fixmap (FIX_F00F_IDT ,__pa (&idt_table),PAGE_KERNEL_RO ); - -/* -* Update the IDT descriptor and reload the IDT so that -* it uses the read-only mapped virtual address. -*/ - idt_descr.address =fix_to_virt (FIX_F00F_IDT ); -load_idt (&idt_descr); -} -#endif -/* * This needs to use 'idt_table' rather than 'idt', and * thus use the _nonmapped_ version of the IDT, as the