mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

powerpc/mm:: Cleanup careful_allocation(): bootmem already panics

Browse source 
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>
This commit is contained in:
Dave Hansen 2008-12-09 08:21:33 +00:00 committed by Benjamin Herrenschmidt
parent c555e520ef
commit 5d21ea2b0e
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/powerpc/mm/numa.c
View file

@ -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);