diff options
author | Yasunori Goto | 2006-12-22 01:09:54 -0800 |
---|---|---|
committer | Linus Torvalds | 2006-12-22 08:55:49 -0800 |
commit | 5c95da9f5abeff865b7273b59e1a3c50a2c5acb2 (patch) | |
tree | 90887812982511b7bb48bcbfed8bdc0c40140a5d /arch/i386/kernel/setup.c | |
parent | 561ccd3a97867ed33e1670feeca3391cd4d6fa2c (diff) |
[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>
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r-- | arch/i386/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 79df6e612dbd..6f6cb7b31d18 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) |