Merge HEAD from ../scsi-misc-2.6-tmp

[sfrench/cifs-2.6.git] / arch / ppc64 / mm / numa.c

diff --git a/arch/ppc64/mm/numa.c b/arch/ppc64/mm/numa.c
index cafd91aef289ecc4354f6252be37ee5f36006f98..0b191f2de0163b64d20b302a92f5047aee23ed8e 100644 (file)
--- a/arch/ppc64/mm/numa.c
+++ b/arch/ppc64/mm/numa.c
@@ -647,7 +647,12 @@ 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 = numa_enabled ? of_node_numa_domain(memory) : 0;
+                       if (numa_enabled) {
+                               numa_domain = of_node_numa_domain(memory);
+                               if (numa_domain  >= MAX_NUMNODES)
+                                       numa_domain = 0;
+                       } else
+                               numa_domain =  0;
 
                        if (numa_domain != nid)
                                continue;