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 <[EMAIL PROTECTED]>
---
linux-2.6.git-dave/arch/powerpc/mm/numa.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff -puN arch/powerpc/mm/numa.c~cleanup-careful_allocation
arch/powerpc/mm/numa.c
--- linux-2.6.git/arch/powerpc/mm/numa.c~cleanup-careful_allocation
2008-12-09 10:16:05.000000000 -0800
+++ linux-2.6.git-dave/arch/powerpc/mm/numa.c 2008-12-09 10:16:05.000000000
-0800
@@ -836,7 +836,7 @@ static void __init *careful_allocation(i
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(i
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);
_
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
