]> err.no Git - linux-2.6/commitdiff
x86: fix smp init sections
authorRandy Dunlap <randy.dunlap@oracle.com>
Mon, 12 Nov 2007 05:06:45 +0000 (21:06 -0800)
committerThomas Gleixner <tglx@apollo.(none)>
Sat, 17 Nov 2007 15:27:00 +0000 (16:27 +0100)
Fix Voyager section mismatch due to using __devinit instead of __cpuinit.

WARNING: vmlinux.o(.text+0xd943): Section mismatch: reference to .init.text:init_gdt (between 'voyager_smp_prepare_boot_cpu' and 'smp_vic_cmn_interrupt')

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/mach-voyager/voyager_smp.c

index 69371434b0cfe9b3f2622b539423faa93cb44939..88124dd35406d2484f999c837833d4a9c270ba03 100644 (file)
@@ -1900,7 +1900,7 @@ voyager_smp_prepare_cpus(unsigned int max_cpus)
        smp_boot_cpus();
 }
 
-static void __devinit voyager_smp_prepare_boot_cpu(void)
+static void __cpuinit voyager_smp_prepare_boot_cpu(void)
 {
        init_gdt(smp_processor_id());
        switch_to_new_gdt();
@@ -1911,7 +1911,7 @@ static void __devinit voyager_smp_prepare_boot_cpu(void)
        cpu_set(smp_processor_id(), cpu_present_map);
 }
 
-static int __devinit
+static int __cpuinit
 voyager_cpu_up(unsigned int cpu)
 {
        /* This only works at boot for x86.  See "rewrite" above. */