Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753667AbdCNDIZ (ORCPT ); Mon, 13 Mar 2017 23:08:25 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33409 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012AbdCNDIY (ORCPT ); Mon, 13 Mar 2017 23:08:24 -0400 From: Wei Yang To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, tj@kernel.org, bp@alien8.de Cc: linux-kernel@vger.kernel.org, Wei Yang Subject: [Patch V2 1/2] x86/mm/numa: trivial fix on typo and error message Date: Tue, 14 Mar 2017 11:08:00 +0800 Message-Id: <20170314030801.13656-1-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1350 Lines: 40 When allocating pg_data in alloc_node_data(), it will try to allocate from local node first and then from any node. If it fails at the second trial, it means there is not available memory on any node. This patch fixes the error message and correct one typo. Signed-off-by: Wei Yang --- v2: * also print the original nid in the error message, based on Borislav's comment --- arch/x86/mm/numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 12dcad7297a5..ac632e5397aa 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -201,7 +201,7 @@ static void __init alloc_node_data(int nid) nd_pa = __memblock_alloc_base(nd_size, SMP_CACHE_BYTES, MEMBLOCK_ALLOC_ACCESSIBLE); if (!nd_pa) { - pr_err("Cannot find %zu bytes in node %d\n", + pr_err("Cannot find %zu bytes in any node(initial node: %d)\n", nd_size, nid); return; } @@ -225,7 +225,7 @@ static void __init alloc_node_data(int nid) * numa_cleanup_meminfo - Cleanup a numa_meminfo * @mi: numa_meminfo to clean up * - * Sanitize @mi by merging and removing unncessary memblks. Also check for + * Sanitize @mi by merging and removing unnecessary memblks. Also check for * conflicts and clear unused memblks. * * RETURNS: -- 2.11.0