diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2005-09-06 21:00:02 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-09 22:11:34 +1000 |
| commit | 34b5233f379847097a1925a02b62f129c407c1e4 (patch) | |
| tree | 5a0383c36ba30c2db3c3fdf30dfaa3d9c594b55c /arch/ppc64 | |
| parent | a84195f36e373001e6eed2e95a5dc1994cf30480 (diff) | |
| download | op-kernel-dev-34b5233f379847097a1925a02b62f129c407c1e4.zip op-kernel-dev-34b5233f379847097a1925a02b62f129c407c1e4.tar.gz | |
[PATCH] ppc64: Fix oops for !CONFIG_NUMA
The SPARSEMEM EXTREME code (802f192e4a600f7ef84ca25c8b818c8830acef5a) 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: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c index a14ab87..c2157c9 100644 --- a/arch/ppc64/mm/init.c +++ b/arch/ppc64/mm/init.c @@ -554,12 +554,12 @@ void __init do_init_bootmem(void) * present. */ 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)); /* reserve the sections we're already using */ 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)); for (i=0; i < lmb.memory.cnt; i++) |
