]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
[PATCH] compile error of register_memory()
authorYasunori Goto <y-goto@jp.fujitsu.com>
Fri, 22 Dec 2006 09:09:54 +0000 (01:09 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 22 Dec 2006 16:55:49 +0000 (08:55 -0800)
commit5c95da9f5abeff865b7273b59e1a3c50a2c5acb2
tree90887812982511b7bb48bcbfed8bdc0c40140a5d
parent561ccd3a97867ed33e1670feeca3391cd4d6fa2c
[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>
arch/i386/kernel/e820.c
arch/i386/kernel/setup.c
include/asm-i386/e820.h