Commit 3a88fe3b authored Mar 31, 2014 by Linus Torvalds

Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 acpi numa fix from Ingo Molnar:
 "A single NUMA CPU hotplug fix"

* 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, acpi: Fix bug in associating hot-added CPUs with corresponding NUMA node

parents 971eae7c 896dc506

arch/x86/kernel/acpi/boot.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -613,10 +613,10 @@ static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
		int nid;

		nid = acpi_get_node(handle);
		if (nid == -1 \|\| !node_online(nid))
		return;
		if (nid != -1) {
		set_apicid_to_node(physid, nid);
		numa_set_node(cpu, nid);
		}
		#endif
		}