Skip to contentSkip to conversation

ppc64: Fix oops for !CONFIG_NUMA

PATCH New Michael Ellerman 1 participant 1 message Sep 6, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 arch/ppc64/mm/init.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/ppc64/mm/init.c +2 -2
Index: work/arch/ppc64/mm/init.c
===================================================================
@@ -553,12 +553,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++)