diff options
author | Andi Kleen <ak@suse.de> | 2008-01-30 07:32:49 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:49 -0500 |
commit | e3cfac84cfbc8c9f17817573befc0f4913b1a4dc (patch) | |
tree | cab21694a582fff19913e02cedeb615d44f6b5a8 /arch/x86/kernel/setup_64.c | |
parent | a9a832902fccc958caa339677dbff766e51b02c3 (diff) |
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 <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r-- | arch/x86/kernel/setup_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 1caf7458dc48..a7124bfb8578 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
@@ -279,7 +279,7 @@ static void discover_ebda(void) | |||
279 | } | 279 | } |
280 | 280 | ||
281 | /* Overridden in paravirt.c if CONFIG_PARAVIRT */ | 281 | /* Overridden in paravirt.c if CONFIG_PARAVIRT */ |
282 | void __attribute__((weak)) memory_setup(void) | 282 | void __attribute__((weak)) __init memory_setup(void) |
283 | { | 283 | { |
284 | machine_specific_memory_setup(); | 284 | machine_specific_memory_setup(); |
285 | } | 285 | } |