[PATCH] ppc64: Make numa=off command line argument work again

[Michael Ellerman]

Hi Andrew,

Mike's patch "ppc64: NUMA memory fixup (another try)" broke the
numa code when "numa=off" is specified on the kernel command line.

The fix is to pretend everything is in node 0 when numa is disabled.

Boot tested on pSeries LPAR with numa=off and numa=debug (ie. on).

cheers

Index: 2.6.12-rc1-mem-limit/arch/ppc64/mm/numa.c
===================================================================
--- 2.6.12-rc1-mem-limit.orig/arch/ppc64/mm/numa.c
+++ 2.6.12-rc1-mem-limit/arch/ppc64/mm/numa.c
@@ -609,7 +609,7 @@ void __init do_init_bootmem(void)
 new_range:
 			mem_start = read_n_cells(addr_cells, &memcell_buf);
 			mem_size = read_n_cells(size_cells, &memcell_buf);
-			numa_domain = of_node_numa_domain(memory);
+			numa_domain = numa_enabled ? of_node_numa_domain(memory) : 0;

 			if (numa_domain != nid)
 				continue;