kernel-ark/arch/x86_64
Yasunori Goto 8243229f09 [PATCH] x86_64: fix memory hotplug build with NUMA=n
This is to fix compile error of x86-64 memory hotplug without any NUMA
option.

  CC      arch/x86_64/mm/init.o
arch/x86_64/mm/init.c:501: error: redefinition of 'memory_add_physaddr_to_nid'
include/linux/memory_hotplug.h:71: error: previous definition of 'memory_add_phys
addr_to_nid' was here
arch/x86_64/mm/init.c:509: error: redefinition of 'memory_add_physaddr_to_nid'
arch/x86_64/mm/init.c:501: error: previous definition of 'memory_add_physaddr_to_
nid' was here

I confirmed compile completion with !NUMA, (NUMA & !ACPI_NUMA),
or (NUMA & ACPI_NUMA).

Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Acked-by: Andi Kleen <ak@suse.de>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-11-20 09:42:05 -08:00
..
boot [PATCH] x86-64: shorten the x86_64 boot setup GDT to what the comment says 2006-11-14 16:57:46 +01:00
crypto [CRYPTO] api: Get rid of flags argument to setkey 2006-09-21 11:41:02 +10:00
ia32 [PATCH] x86-64: Fix PTRACE_[SG]ET_THREAD_AREA regression with ia32 emulation. 2006-11-14 16:57:46 +01:00
kernel [PATCH] i386/x86_64: ACPI cpu_idle_wait() fix 2006-11-17 08:20:09 -08:00
lib Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
mm [PATCH] x86_64: fix memory hotplug build with NUMA=n 2006-11-20 09:42:05 -08:00
oprofile [PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu 2005-11-07 07:53:35 -08:00
pci Revert "[PATCH] MMCONFIG and new Intel motherboards" 2006-11-14 16:56:33 +01:00
defconfig [PATCH] x86-64: Update defconfig 2006-10-21 18:37:00 +02:00
Kconfig more misc typo fixes 2006-10-03 22:34:14 +02:00
Kconfig.debug [PATCH] lockdep: irqtrace subsystem, x86_64 support 2006-07-03 15:27:03 -07:00
Makefile [PATCH] x86_64: fix CONFIG_CC_STACKPROTECTOR build bug 2006-11-16 14:00:25 -08:00