Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752256AbdDCKAG (ORCPT ); Mon, 3 Apr 2017 06:00:06 -0400 Received: from terminus.zytor.com ([65.50.211.136]:51401 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751466AbdDCKAE (ORCPT ); Mon, 3 Apr 2017 06:00:04 -0400 Date: Mon, 3 Apr 2017 02:57:52 -0700 From: tip-bot for Wei Yang Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, richard.weiyang@gmail.com, mingo@kernel.org, bp@suse.de, tglx@linutronix.de Reply-To: tglx@linutronix.de, bp@suse.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, richard.weiyang@gmail.com In-Reply-To: <20170314030801.13656-1-richard.weiyang@gmail.com> References: <20170314030801.13656-1-richard.weiyang@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm/numa: Improve alloc_node_data() error path message Git-Commit-ID: 43dac8f6a74c9811454f4efbe52b48f7a802c277 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1791 Lines: 46 Commit-ID: 43dac8f6a74c9811454f4efbe52b48f7a802c277 Gitweb: http://git.kernel.org/tip/43dac8f6a74c9811454f4efbe52b48f7a802c277 Author: Wei Yang AuthorDate: Tue, 14 Mar 2017 11:08:00 +0800 Committer: Thomas Gleixner CommitDate: Mon, 3 Apr 2017 11:54:37 +0200 x86/mm/numa: Improve alloc_node_data() error path message alloc_node_data() tries to allocate from the local node first and, if that attempt fails, falls back to any node. Improve the error message to issue the initial node for ease during debugging. Fix a typo in the comments, while at it. Signed-off-by: Wei Yang Link: http://lkml.kernel.org/r/20170314030801.13656-1-richard.weiyang@gmail.com [ Masssage commit message. ] Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner --- 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 12dcad7..93671d8 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: