[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-43dac8f6a74c9811454f4efbe52b48f7a802c277@git.kernel.org>
Date: Mon, 3 Apr 2017 02:57:52 -0700
From: tip-bot for Wei Yang <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, linux-kernel@...r.kernel.org,
richard.weiyang@...il.com, mingo@...nel.org, bp@...e.de,
tglx@...utronix.de
Subject: [tip:x86/mm] x86/mm/numa: Improve alloc_node_data() error path
message
Commit-ID: 43dac8f6a74c9811454f4efbe52b48f7a802c277
Gitweb: http://git.kernel.org/tip/43dac8f6a74c9811454f4efbe52b48f7a802c277
Author: Wei Yang <richard.weiyang@...il.com>
AuthorDate: Tue, 14 Mar 2017 11:08:00 +0800
Committer: Thomas Gleixner <tglx@...utronix.de>
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 <richard.weiyang@...il.com>
Link: http://lkml.kernel.org/r/20170314030801.13656-1-richard.weiyang@gmail.com
[ Masssage commit message. ]
Signed-off-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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:
Powered by blists - more mailing lists