From be6947deb8ce27ff10541589cedee3409815dd11 Mon Sep 17 00:00:00 2001
From: Mike Kravetz <kravetz@us.ibm.com>
Date: Mon, 1 Aug 2005 21:11:48 -0700
Subject: [PATCH] --- yaml --- r: 5586 b: refs/heads/master c:
 96cd5b0856a25e2ec366702e1923070ffca53dae h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/ppc64/mm/numa.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ba509746db5b..1060b99d2c14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 842bbaaa7394820c8f1fe0629cd15478653caf86
+refs/heads/master: 96cd5b0856a25e2ec366702e1923070ffca53dae
diff --git a/trunk/arch/ppc64/mm/numa.c b/trunk/arch/ppc64/mm/numa.c
index cafd91aef289..0b191f2de016 100644
--- a/trunk/arch/ppc64/mm/numa.c
+++ b/trunk/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;