• Yasunori Goto's avatar
    [PATCH] x86_64: fix memory hotplug build with NUMA=n · 8243229f
    Yasunori Goto authored
    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: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
    Acked-by: default avatarAndi Kleen <ak@suse.de>
    Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
    Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    8243229f
init.c 18.9 KB