[PATCH] ppc64: POWER 4 fails to boot with NUMA

If CONFIG_NUMA is set, some POWER 4 systems will fail to boot. This is
because of special processing needed to handle invalid node IDs (0xffff) on
POWER 4. My previous patch to handle memory 'holes' within nodes forgot to
add this special case for POWER 4 in one place.

In reality, I'm not sure that configuring the kernel for NUMA on POWER 4 makes
much sense. Are there POWER 4 based systems with NUMA characteristics that
are presented by the firmware? But, distros want one kernel for all systems
so NUMA is on by default in their kernels. The patch handles those cases.

Signed-off-by: Mike Kravetz <kravetz@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Mike Kravetz and committed by Linus Torvalds 96cd5b08 842bbaaa

Changed files
+6 -1
arch
ppc64
mm
+6 -1
arch/ppc64/mm/numa.c
··· 647 647 new_range: 648 648 mem_start = read_n_cells(addr_cells, &memcell_buf); 649 649 mem_size = read_n_cells(size_cells, &memcell_buf); 650 - numa_domain = numa_enabled ? of_node_numa_domain(memory) : 0; 650 + if (numa_enabled) { 651 + numa_domain = of_node_numa_domain(memory); 652 + if (numa_domain >= MAX_NUMNODES) 653 + numa_domain = 0; 654 + } else 655 + numa_domain = 0; 651 656 652 657 if (numa_domain != nid) 653 658 continue;