From 43161f863281d5026d02cd23aaa155e179deae08 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 22 Jun 2006 00:00:00 -0700
Subject: [PATCH] --- yaml --- r: 29557 b: refs/heads/master c:
 486ad10a7e1b2bb61ea9e48c4d9510f50cd74fc5 h: refs/heads/master i:   29555:
 9e2570c9535236155e2723894124578a3de53c3f v: v3

---
 [refs]                       |  2 +-
 trunk/arch/sparc64/mm/init.c | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6ec8c506707f..9158f01250dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07f8e5f358a0b7240f1dad6b3819f2fd1103f159
+refs/heads/master: 486ad10a7e1b2bb61ea9e48c4d9510f50cd74fc5
diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c
index 45a70d677d8b..9d2b0da590af 100644
--- a/trunk/arch/sparc64/mm/init.c
+++ b/trunk/arch/sparc64/mm/init.c
@@ -102,8 +102,6 @@ static void __init read_obp_memory(const char *property,
 		prom_halt();
 	}
 
-	*num_ents = ents;
-
 	/* Sanitize what we got from the firmware, by page aligning
 	 * everything.
 	 */
@@ -125,6 +123,25 @@ static void __init read_obp_memory(const char *property,
 		regs[i].phys_addr = base;
 		regs[i].reg_size = size;
 	}
+
+	for (i = 0; i < ents; i++) {
+		if (regs[i].reg_size == 0UL) {
+			int j;
+
+			for (j = i; j < ents - 1; j++) {
+				regs[j].phys_addr =
+					regs[j+1].phys_addr;
+				regs[j].reg_size =
+					regs[j+1].reg_size;
+			}
+
+			ents--;
+			i--;
+		}
+	}
+
+	*num_ents = ents;
+
 	sort(regs, ents, sizeof(struct linux_prom64_registers),
 	     cmp_p64, NULL);
 }