diff options
| author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-12-22 09:09:54 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 16:55:49 (GMT) |
| commit | 5c95da9f5abeff865b7273b59e1a3c50a2c5acb2 (patch) | |
| tree | 90887812982511b7bb48bcbfed8bdc0c40140a5d | |
| parent | 561ccd3a97867ed33e1670feeca3391cd4d6fa2c (diff) | |
| download | linux-5c95da9f5abeff865b7273b59e1a3c50a2c5acb2.tar.xz | |
[PATCH] compile error of register_memory()
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.
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/e820.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/setup.c | 2 | ||||
| -rw-r--r-- | include/asm-i386/e820.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/e820.c b/arch/i386/kernel/e820.c index 2f7d0a9..f391abc 100644 --- a/arch/i386/kernel/e820.c +++ b/arch/i386/kernel/e820.c @@ -668,7 +668,7 @@ void __init register_bootmem_low_pages(unsigned long max_low_pfn) } } -void __init register_memory(void) +void __init e820_register_memory(void) { unsigned long gapstart, gapsize, round; unsigned long long last; diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 79df6e6..6f6cb7b 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -639,7 +639,7 @@ void __init setup_arch(char **cmdline_p) get_smp_config(); #endif - register_memory(); + e820_register_memory(); #ifdef CONFIG_VT #if defined(CONFIG_VGA_CONSOLE) diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h index 395077a..c5b8fc6 100644 --- a/include/asm-i386/e820.h +++ b/include/asm-i386/e820.h @@ -40,7 +40,7 @@ extern int e820_all_mapped(unsigned long start, unsigned long end, 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); |