Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43dac8f6 authored by Wei Yang's avatar Wei Yang Committed by Thomas Gleixner
Browse files

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: default avatarWei Yang <richard.weiyang@gmail.com>
Link: http://lkml.kernel.org/r/20170314030801.13656-1-richard.weiyang@gmail.com


[ Masssage commit message. ]
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ada26481

arch/x86/mm/numa.c

+2 −2
Original line number Diff line number Diff line
@@ -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: