diff options
Diffstat (limited to 'arch/powerpc/mm/numa.c')
-rw-r--r-- | arch/powerpc/mm/numa.c | 6 |
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); |