From e65d2f828cf32fbae255a5d8f48cf9cf5f9b2caf Mon Sep 17 00:00:00 2001 From: Dave Hansen Date: Tue, 9 Dec 2008 08:21:33 +0000 Subject: [PATCH] --- yaml --- r: 127666 b: refs/heads/master c: 5d21ea2b0e1d9d5d880670dbb9a96efe9b419583 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/numa.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 18765fa9de9c..a016fb2d75ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c555e520ef794a94dc36a8ded93ece6369ff7ca0 +refs/heads/master: 5d21ea2b0e1d9d5d880670dbb9a96efe9b419583 diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c index 213664c9cdca..aabf30175eb5 100644 --- a/trunk/arch/powerpc/mm/numa.c +++ b/trunk/arch/powerpc/mm/numa.c @@ -836,7 +836,7 @@ static void __init *careful_allocation(int nid, unsigned long size, ret = __lmb_alloc_base(size, align, lmb_end_of_DRAM()); if (!ret) - panic("numa.c: cannot allocate %lu bytes on node %d", + panic("numa.c: cannot allocate %lu bytes for node %d", size, nid); /* @@ -856,10 +856,6 @@ static void __init *careful_allocation(int nid, unsigned long size, ret = (unsigned long)__alloc_bootmem_node(NODE_DATA(new_nid), size, align, 0); - if (!ret) - panic("numa.c: cannot allocate %lu bytes on node %d", - size, new_nid); - ret = __pa(ret); dbg("alloc_bootmem %lx %lx\n", ret, size);