From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752758AbdBFPgD (ORCPT ); Mon, 6 Feb 2017 10:36:03 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36069 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbdBFPgB (ORCPT ); Mon, 6 Feb 2017 10:36:01 -0500 From: Wei Yang To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, tj@kernel.org Cc: linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH 1/2] x86/mm/numa: trivial fix on typo and error message Date: Mon, 6 Feb 2017 23:35:28 +0800 Message-Id: <20170206153529.14614-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 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 --- arch/x86/mm/numa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 4366242356c5..3e9110b34147 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -201,8 +201,8 @@ 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", - nd_size, nid); + pr_err("Cannot find %zu bytes in any node\n", + nd_size); 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