diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-10-17 12:04:33 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:15:26 -0400 |
commit | d72b1b4f41b5159d2d0e54e54c794d500197572e (patch) | |
tree | eca58e1ee8e7fd7014b99a8c8a7bcf3c5b9038e1 /arch/x86/kernel/traps_32.c | |
parent | 25d1b5167780c7f245d9655d302f6a3d8bf61d19 (diff) |
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 <frankvm@frankvm.com> supplied the .config used
to reproduce the warning.
[ tglx: arch/x86 adaptation ]
Cc: Frank van Maarseveen <frankvm@frankvm.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.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>
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
-rw-r--r-- | arch/x86/kernel/traps_32.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 05c27ecaf2a7..0fce34226b7d 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -1112,20 +1112,6 @@ asmlinkage void math_emulate(long arg) | |||
1112 | 1112 | ||
1113 | #endif /* CONFIG_MATH_EMULATION */ | 1113 | #endif /* CONFIG_MATH_EMULATION */ |
1114 | 1114 | ||
1115 | #ifdef CONFIG_X86_F00F_BUG | ||
1116 | void __init trap_init_f00f_bug(void) | ||
1117 | { | ||
1118 | __set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO); | ||
1119 | |||
1120 | /* | ||
1121 | * Update the IDT descriptor and reload the IDT so that | ||
1122 | * it uses the read-only mapped virtual address. | ||
1123 | */ | ||
1124 | idt_descr.address = fix_to_virt(FIX_F00F_IDT); | ||
1125 | load_idt(&idt_descr); | ||
1126 | } | ||
1127 | #endif | ||
1128 | |||
1129 | /* | 1115 | /* |
1130 | * This needs to use 'idt_table' rather than 'idt', and | 1116 | * This needs to use 'idt_table' rather than 'idt', and |
1131 | * thus use the _nonmapped_ version of the IDT, as the | 1117 | * thus use the _nonmapped_ version of the IDT, as the |