]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86_32: select_idle_routine() must be __cpuinit
authorAdrian Bunk <bunk@kernel.org>
Wed, 19 Dec 2007 22:20:18 +0000 (23:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 19 Dec 2007 22:20:18 +0000 (23:20 +0100)
CONFIG_HOTPLUG_CPU=y:

WARNING: vmlinux.o(.text+0x1199a): Section mismatch: reference to .init.text.5:select_idle_routine (between 'init_intel' and 'init_nexgen')

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>
arch/x86/kernel/process_32.c

index 7b899584d290833cdbfed7dee779e20043a91ddb..9663c2a74830efcfdb1268bc862d9bac082e7f1c 100644 (file)
@@ -261,7 +261,7 @@ static void mwait_idle(void)
        mwait_idle_with_hints(0, 0);
 }
 
-void __devinit select_idle_routine(const struct cpuinfo_x86 *c)
+void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
 {
        if (cpu_has(c, X86_FEATURE_MWAIT)) {
                printk("monitor/mwait feature present.\n");