Commit 34b5233f authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras

[PATCH] ppc64: Fix oops for !CONFIG_NUMA

The SPARSEMEM EXTREME code (802f192e) that
went in yesterday broke PPC64 for !CONFIG_NUMA.

The problem is that (free|reserve)_bootmem don't take a page number as their
first argument, they take an address. Ruh roh.

Booted on P5 LPAR, iSeries and G5.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a84195f3
...@@ -554,12 +554,12 @@ void __init do_init_bootmem(void) ...@@ -554,12 +554,12 @@ void __init do_init_bootmem(void)
* present. * present.
*/ */
for (i=0; i < lmb.memory.cnt; i++) for (i=0; i < lmb.memory.cnt; i++)
free_bootmem(lmb_start_pfn(&lmb.memory, i), free_bootmem(lmb.memory.region[i].base,
lmb_size_bytes(&lmb.memory, i)); lmb_size_bytes(&lmb.memory, i));
/* reserve the sections we're already using */ /* reserve the sections we're already using */
for (i=0; i < lmb.reserved.cnt; i++) for (i=0; i < lmb.reserved.cnt; i++)
reserve_bootmem(lmb_start_pfn(&lmb.reserved, i), reserve_bootmem(lmb.reserved.region[i].base,
lmb_size_bytes(&lmb.reserved, i)); lmb_size_bytes(&lmb.reserved, i));
for (i=0; i < lmb.memory.cnt; i++) for (i=0; i < lmb.memory.cnt; i++)
......
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