[tip:x86/numa] x86-32, numa: Make init_alloc_remap() less panicky
From: tip-bot for Tejun Heo
Date: Wed Apr 06 2011 - 22:07:22 EST
Commit-ID: 82044c328d6f6b22882c2a936e487e6d2240817a
Gitweb: http://git.kernel.org/tip/82044c328d6f6b22882c2a936e487e6d2240817a
Author: Tejun Heo <tj@xxxxxxxxxx>
AuthorDate: Tue, 5 Apr 2011 00:23:54 +0200
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Wed, 6 Apr 2011 17:57:21 -0700
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@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/1301955840-7246-9-git-send-email-tj@xxxxxxxxxx
Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/mm/numa_32.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index 9a73365..c127543 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/