From: Andi Kleen Date: Wed, 30 Jan 2008 12:32:49 +0000 (+0100) Subject: x86: mark memory_setup __init X-Git-Tag: v2.6.25-rc1~1143^2~391 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3cfac84cfbc8c9f17817573befc0f4913b1a4dc;p=linux-2.6-omap-h63xx.git x86: mark memory_setup __init 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 Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 1caf7458dc4..a7124bfb857 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -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(); }