aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorDave Hansen <dave@linux.vnet.ibm.com>2008-12-09 03:21:33 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-08 00:25:08 -0500
commit5d21ea2b0e1d9d5d880670dbb9a96efe9b419583 (patch)
tree10f427695e940778473c3ec350ae8e5e34eb8288 /arch/powerpc/mm
parentc555e520ef794a94dc36a8ded93ece6369ff7ca0 (diff)
powerpc/mm:: Cleanup careful_allocation(): bootmem already panics
If we fail a bootmem allocation, the bootmem code itself panics. No need to redo it here. Also change the wording of the other panic. We don't strictly have to allocate memory on the specified node. It is just a hint and that node may not even *have* any memory on it. In that case we can and do fall back to other nodes. Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/numa.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 213664c9cdca..aabf30175eb5 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -836,7 +836,7 @@ static void __init *careful_allocation(int nid, unsigned long size,
836 ret = __lmb_alloc_base(size, align, lmb_end_of_DRAM()); 836 ret = __lmb_alloc_base(size, align, lmb_end_of_DRAM());
837 837
838 if (!ret) 838 if (!ret)
839 panic("numa.c: cannot allocate %lu bytes on node %d", 839 panic("numa.c: cannot allocate %lu bytes for node %d",
840 size, nid); 840 size, nid);
841 841
842 /* 842 /*
@@ -856,10 +856,6 @@ static void __init *careful_allocation(int nid, unsigned long size,
856 ret = (unsigned long)__alloc_bootmem_node(NODE_DATA(new_nid), 856 ret = (unsigned long)__alloc_bootmem_node(NODE_DATA(new_nid),
857 size, align, 0); 857 size, align, 0);
858 858
859 if (!ret)
860 panic("numa.c: cannot allocate %lu bytes on node %d",
861 size, new_nid);
862
863 ret = __pa(ret); 859 ret = __pa(ret);
864 860
865 dbg("alloc_bootmem %lx %lx\n", ret, size); 861 dbg("alloc_bootmem %lx %lx\n", ret, size);