summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2007-12-19 23:20:19 +0100
committerIngo Molnar <mingo@elte.hu>2007-12-19 23:20:19 +0100
commit3d054f0fade192b454592817c16e0f49e3e295dc (patch)
tree2e27475f1a4ce72424ad1851e03c3204b7905805 /arch/x86
parentx86_32: select_idle_routine() must be __cpuinit (diff)
downloadlinux-3d054f0fade192b454592817c16e0f49e3e295dc.tar.xz
linux-3d054f0fade192b454592817c16e0f49e3e295dc.zip
x86_32: disable_pse must be __cpuinitdata
CONFIG_HOTPLUG_CPU=y: WARNING: vmlinux.o(.text+0xfa52): Section mismatch: reference to .init.data:disable_pse (between 'identify_cpu' and 'identify_secondary_cpu') [ akpm@linux-foundation.org: initializer fix. ] Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/setup_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index e1e18c34c821..9c24b45b513c 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -67,7 +67,7 @@
address, and must not be in the .bss segment! */
unsigned long init_pg_tables_end __initdata = ~0UL;
-int disable_pse __devinitdata = 0;
+int disable_pse __cpuinitdata = 0;
/*
* Machine setup..