summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/cpu/mtrr/generic.c
diff options
context:
space:
mode:
authorBernhard Walle2007-05-17 07:11:06 +0200
committerLinus Torvalds2007-05-17 14:23:04 +0200
commitdf652fe173c12d29960f3a8eafce29041e86b942 (patch)
treecf14964e4b3d84ba0ec410c43dd876bf40c02ee6 /arch/i386/kernel/cpu/mtrr/generic.c
parentacpi: fix potential call to a freed memory section. (diff)
downloadkernel-qcow2-linux-df652fe173c12d29960f3a8eafce29041e86b942.tar.gz
kernel-qcow2-linux-df652fe173c12d29960f3a8eafce29041e86b942.tar.xz
kernel-qcow2-linux-df652fe173c12d29960f3a8eafce29041e86b942.zip
i386/x86-64: fix section mismatch
WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:mtrr_bp_init from .text between 'id entify_cpu' (at offset 0x6571) and 'IRQ0x20_interrupt' It's because identify_cpu() which is __cpuinit calls mtrr_bp_init() which is __init(). __cpuinit() expands to nothing if CONFIG_HOTPLUG_CPU=y and so the call is illegal. Signed-off-by: Bernhard Walle <bwalle@suse.de> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel/cpu/mtrr/generic.c')
-rw-r--r--arch/i386/kernel/cpu/mtrr/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c
index 5367e32e0403..c4ebb5126ef7 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -78,7 +78,7 @@ static void __cpuinit print_fixed(unsigned base, unsigned step, const mtrr_type*
}
/* Grab all of the MTRR state for this CPU into *state */
-void __init get_mtrr_state(void)
+void get_mtrr_state(void)
{
unsigned int i;
struct mtrr_var_range *vrs;