evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2014-03-31 11:58:08 -07:00
commit 3a88fe3b74
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/acpi/boot.c
View file

@ -613,10 +613,10 @@ static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
int nid; int nid;
nid = acpi_get_node(handle); nid = acpi_get_node(handle);
if (nid == -1 || !node_online(nid)) if (nid != -1) {
return;
set_apicid_to_node(physid, nid); set_apicid_to_node(physid, nid);
numa_set_node(cpu, nid); numa_set_node(cpu, nid);
}
#endif #endif
} }