d
parent 561ccd3a97867ed33e1670feeca3391cd4d6fa2c
author Yasunori Goto <y-goto@jp.fujitsu.com> 1166778594 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1166806549 -0800

[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>