From ae848fbb96076afe1a2787b7b211cd088aaded38 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 5 Apr 2011 00:23:54 +0200 Subject: [PATCH] --- yaml --- r: 245685 b: refs/heads/master c: 82044c328d6f6b22882c2a936e487e6d2240817a h: refs/heads/master i: 245683: cb502bcf0c185d59d1de5b17438a600ec3a5055a v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa_32.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e768def04fe..8a0f338d09dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7210cf9217937e470a9acbc113a590f476b9c047 +refs/heads/master: 82044c328d6f6b22882c2a936e487e6d2240817a diff --git a/trunk/arch/x86/mm/numa_32.c b/trunk/arch/x86/mm/numa_32.c index 9a7336550f0d..c127543372f5 100644 --- a/trunk/arch/x86/mm/numa_32.c +++ b/trunk/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;