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

[PATCH] powerpc: Don't allocate zero bytes in finish_device_tree()

In prom.c we run finish_node() on allnodes twice. The first time we just
calculate how much memory we'll need, the second time we do the actual work.

If the calculation stage determines that we need 0 bytes, then we should skip
the lmb allocation. Although an alloc of zero will work, it has been seen to
lead to a BUG_ON() in reserve_bootmem() on at least one machine.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3ea4807d
...@@ -491,7 +491,12 @@ void __init finish_device_tree(void) ...@@ -491,7 +491,12 @@ void __init finish_device_tree(void)
size = 16; size = 16;
finish_node(allnodes, &size, 1); finish_node(allnodes, &size, 1);
size -= 16; size -= 16;
end = start = (unsigned long) __va(lmb_alloc(size, 128));
if (0 == size)
end = start = 0;
else
end = start = (unsigned long)__va(lmb_alloc(size, 128));
finish_node(allnodes, &end, 0); finish_node(allnodes, &end, 0);
BUG_ON(end != start + size); BUG_ON(end != start + size);
......
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