2015-06-17 03:38:32

by gongzg

[permalink] [raw]
Subject: [PATCH 1/3] cpu-hotadd-patch-liujiang

From: songxiumiao <[email protected]>

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

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index dbe76a1..b8f93b3 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -733,6 +733,10 @@ static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

nid = acpi_get_node(handle);
if (nid != -1) {
+ if (try_online_node(nid)) {
+ pr_warn("failed to online node%d for CPU%d, use node%d instead.\n",nid, cpu, first_node(node_online_map));
+ nid = first_node(node_online_map);
+ }
set_apicid_to_node(physid, nid);
numa_set_node(cpu, nid);
}
--
1.7.1