Commit 95920324 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras

[PATCH] ppc64: unflatten_device_tree() should check if lmb_alloc() fails

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: default avatarMichael Ellerman <michael@ellerman.id.au>

 arch/ppc64/kernel/prom.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 145ec7d5
...@@ -950,8 +950,13 @@ void __init unflatten_device_tree(void) ...@@ -950,8 +950,13 @@ void __init unflatten_device_tree(void)
DBG(" size is %lx, allocating...\n", size); DBG(" size is %lx, allocating...\n", size);
/* Allocate memory for the expanded device tree */ /* Allocate memory for the expanded device tree */
mem = (unsigned long)abs_to_virt(lmb_alloc(size + 4, mem = lmb_alloc(size + 4, __alignof__(struct device_node));
__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; ((u32 *)mem)[size / 4] = 0xdeadbeef;
DBG(" unflattening...\n", mem); DBG(" unflattening...\n", mem);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment