Commit 82044c32 authored Apr 05, 2011 by Tejun Heo Committed by H. Peter Anvin Apr 06, 2011

x86-32, numa: Make init_alloc_remap() less panicky



Remap allocator failure isn't fatal.  The callers are required to fall
back to regular early memory allocation mechanisms on failure anyway,
so there's no reason to panic on remap init failure.  Whining and
returning are enough.

Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1301955840-7246-9-git-send-email-tj@kernel.org


Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parent 7210cf92

arch/x86/mm/numa_32.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -290,8 +290,11 @@ static __init unsigned long init_alloc_remap(int nid, unsigned long offset)
		node_pa = memblock_find_in_range(node_start_pfn[nid] << PAGE_SHIFT,
		(u64)node_end_pfn[nid] << PAGE_SHIFT,
		size, LARGE_PAGE_BYTES);
		if (node_pa == MEMBLOCK_ERROR)
		panic("Can not get kva ram\n");
		if (node_pa == MEMBLOCK_ERROR) {
		pr_warning("remap_alloc: failed to allocate %lu bytes for node %d\n",
		size, nid);
		return 0;
		}

		node_remap_size[nid] = size >> PAGE_SHIFT;
		node_remap_offset[nid] = offset;

Admin message