x86: mark memory_setup __init

[linux-2.6] / arch / x86 / kernel / setup_64.c

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 1caf7458dc48da7342f6f0a83eec3d9fad0fc1aa..a7124bfb85785792894acbdf2587ed6cd05b6b9e 100644 (file)
--- 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();
 }