From: KAMEZAWA Hiroyuki This patch is necessary for ia64 drivers/built-in.o(.text+0x6c661): In function `acpi_memory_enable_device': : undefined reference to `memory_add_physaddr_to_nid' ia64 has to define memory_add_physaddr_to_nid() Signed-off-by: KAMEZAWA Hiroyuki Cc: Keith Mannthey Signed-off-by: Andrew Morton --- arch/ia64/mm/numa.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff -puN arch/ia64/mm/numa.c~hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup-fix arch/ia64/mm/numa.c --- a/arch/ia64/mm/numa.c~hot-add-mem-x86_64-memory_add_physaddr_to_nid-node-fixup-fix +++ a/arch/ia64/mm/numa.c @@ -69,4 +69,20 @@ int early_pfn_to_nid(unsigned long pfn) return 0; } + +#ifdef CONFIG_MEMORY_HOTPLUG +/* + * SRAT information is stored in node_memblk[], then we can use SRAT + * information at memory-hot-add if necessary. + */ + +int memory_add_physaddr_to_nid(u64 addr) +{ + int nid = paddr_to_nid(addr); + if (nid < 0) + return 0; + return nid; +} + +#endif #endif _