Skip to content

Commit

Permalink
[PATCH] ppc64: unflatten_device_tree() should check if lmb_alloc() fails
Browse files Browse the repository at this point in the history
unflatten_device_tree() doesn't check if lmb_alloc() succeeds or not, it
should. All it can do is panic, but at least there's an error message
(assuming you have some sort of console at that point).

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

 arch/ppc64/kernel/prom.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Aug 29, 2005
1 parent 145ec7d commit 9592032
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arch/ppc64/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -950,8 +950,13 @@ void __init unflatten_device_tree(void)
DBG(" size is %lx, allocating...\n", size);

/* Allocate memory for the expanded device tree */
mem = (unsigned long)abs_to_virt(lmb_alloc(size + 4,
__alignof__(struct device_node)));
mem = lmb_alloc(size + 4, __alignof__(struct device_node));
if (!mem) {
DBG("Couldn't allocate memory with lmb_alloc()!\n");
panic("Couldn't allocate memory with lmb_alloc()!\n");
}
mem = (unsigned long)abs_to_virt(mem);

((u32 *)mem)[size / 4] = 0xdeadbeef;

DBG(" unflattening...\n", mem);
Expand Down

0 comments on commit 9592032

Please sign in to comment.