compile error of register_memory()
PATCH 1/1 compile error of register_memory()
Hello.
register_memory() becomes double definition in 2.6.20-rc1. It is defined in arch/i386/kernel/setup.c as static definition in 2.6.19. But it is moved to arch/i386/kernel/e820.c in 2.6.20-rc1. And same name function is defined in driver/base/memory.c too. So, it becomes cause of compile error of duplicate definition if memory hotplug option is on.
This patch is to fix it.
Signed-off-by Yasunori Goto <[email protected]>
--- arch/i386/kernel/e820.c | 2 +- arch/i386/kernel/setup.c | 2 +- include/asm-i386/e820.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/i386/kernel/e820.c +1 -1
@@ -668,7 +668,7 @@ } } -void __init register_memory (void ) +void __init e820_register_memory (void ) {unsigned long gapstart, gapsize, round;unsigned long long last;
arch/i386/kernel/setup.c +1 -1
@@ -639,7 +639,7 @@get_smp_config ();#endif -register_memory (); +e820_register_memory ();#ifdef CONFIG_VT #if defined(CONFIG_VGA_CONSOLE )
include/asm-i386/e820.h +1 -1
@@ -40,7 +40,7 @@ unsigned type);extern void find_max_pfn (void );extern void register_bootmem_low_pages (unsigned long max_low_pfn); -extern void register_memory (void ); +extern void e820_register_memory (void );extern void limit_regions (unsigned long long size);extern void print_memory_map (char *who);
Signature · 1 line
Yasunori Goto