diff options
| author |   Michael Ellerman <michael@ellerman.id.au> | 2006-01-25 21:31:28 +1300 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-02-07 22:38:34 +1100 |
| commit | d7a5b2ffa1352f0310630934a56aecbdfb617b72 (patch) | |
| tree | 5ec2ed1d4e63d4bd2847531115fd263109a16830 /arch/powerpc/mm/numa.c | |
| parent | [PATCH] powerpc: cleaned up fsl_soc.c (diff) | |
| download | linux-dev-d7a5b2ffa1352f0310630934a56aecbdfb617b72.tar.xz linux-dev-d7a5b2ffa1352f0310630934a56aecbdfb617b72.zip | |
[PATCH] powerpc: Always panic if lmb_alloc() fails
Currently most callers of lmb_alloc() don't check if it worked or not, if it
ever does weird bad things will probably happen. The few callers who do check
just panic or BUG_ON.
So make lmb_alloc() panic internally, to catch bugs at the source. The few
callers who did check the result no longer need to.
The only caller that did anything interesting with the return result was
careful_allocation(). For it we create __lmb_alloc_base() which _doesn't_ panic
automatically, a little messy, but passable.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm/numa.c')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 2863a912bcd0..da5280f8cf42 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -570,11 +570,11 @@ static void __init *careful_allocation(int nid, unsigned long size, unsigned long end_pfn) { int new_nid; - unsigned long ret = lmb_alloc_base(size, align, end_pfn << PAGE_SHIFT); + unsigned long ret = __lmb_alloc_base(size, align, end_pfn << PAGE_SHIFT); /* retry over all memory */ if (!ret) - ret = lmb_alloc_base(size, align, lmb_end_of_DRAM()); + ret = __lmb_alloc_base(size, align, lmb_end_of_DRAM()); if (!ret) panic("numa.c: cannot allocate %lu bytes on node %d", |