[GIT PULL] x86/acpi change for v3.15

[GIT PULL] x86/acpi change for v3.15

[Ingo Molnar]

Linus,

Please pull the latest x86-acpi-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-acpi-for-linus

   # HEAD: 896dc5064083063981954f142e43548765199792 x86, acpi: Fix bug in associating hot-added CPUs with corresponding NUMA node

A single NUMA CPU hotplug fix.

 Thanks,

	Ingo

------------------>
Jiang Liu (1):
      x86, acpi: Fix bug in associating hot-added CPUs with corresponding NUMA node


 arch/x86/kernel/acpi/boot.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 1dac942..9f46f2b 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -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;
-	set_apicid_to_node(physid, nid);
-	numa_set_node(cpu, nid);
+	if (nid != -1) {
+		set_apicid_to_node(physid, nid);
+		numa_set_node(cpu, nid);
+	}
 #endif
 }