diff options
| author | Tejun Heo <tj@kernel.org> | 2011-04-05 00:23:54 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-06 17:57:21 -0700 |
| commit | 82044c328d6f6b22882c2a936e487e6d2240817a (patch) | |
| tree | cdb88921fae4b53b1bae9250c409ce3279222102 /arch/x86/mm | |
| parent | 7210cf9217937e470a9acbc113a590f476b9c047 (diff) | |
| download | op-kernel-dev-82044c328d6f6b22882c2a936e487e6d2240817a.zip op-kernel-dev-82044c328d6f6b22882c2a936e487e6d2240817a.tar.gz | |
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>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | 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; |
