Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754430AbbFQDic (ORCPT ); Tue, 16 Jun 2015 23:38:32 -0400 Received: from sg02.corpemail.net ([128.199.154.28]:51070 "EHLO sg02.corpemail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554AbbFQDiX (ORCPT ); Tue, 16 Jun 2015 23:38:23 -0400 X-Greylist: delayed 77592 seconds by postgrey-1.27 at vger.kernel.org; Tue, 16 Jun 2015 23:38:22 EDT From: gongzg To: CC: songxiumiao Subject: [PATCH 1/3] cpu-hotadd-patch-liujiang Date: Wed, 17 Jun 2015 11:37:56 +0800 Message-ID: <1434512276-11829-1-git-send-email-gongzhaogang@inspur.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.166.15.107] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 963 Lines: 29 From: songxiumiao --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/