]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: mark memory_setup __init
authorAndi Kleen <ak@suse.de>
Wed, 30 Jan 2008 12:32:49 +0000 (13:32 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:32:49 +0000 (13:32 +0100)
Otherwise

WARNING: vmlinux.o(.text+0x64a9): Section mismatch: reference to .init.text:machine_specific_memory_setup (between 'memory_setup' and 'show_cpuinfo')

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/setup_64.c

index 1caf7458dc48da7342f6f0a83eec3d9fad0fc1aa..a7124bfb85785792894acbdf2587ed6cd05b6b9e 100644 (file)
@@ -279,7 +279,7 @@ static void discover_ebda(void)
 }
 
 /* Overridden in paravirt.c if CONFIG_PARAVIRT */
-void __attribute__((weak)) memory_setup(void)
+void __attribute__((weak)) __init memory_setup(void)
 {
        machine_specific_memory_setup();
 }