---

yaml --- r: 377235 b: refs/heads/master c: 771a37f h: refs/heads/master i: 377233: 3732c3c 377231: 3fe4dc3 v: v3
git-mirror · Jun 19, 2013 · 030dea6 · 030dea6
1 parent ebbbbb6
commit 030dea6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d72ee6be58b7c99a6e8da6584106c5958dae2bf8
+refs/heads/master: 771a37ff4d80b80db3b0df3e7696f14b298c67b7
diff --git a/trunk/arch/sparc/mm/init_64.c b/trunk/arch/sparc/mm/init_64.c
@@ -1098,7 +1098,14 @@ static int __init grab_mblocks(struct mdesc_handle *md)
 		m->size = *val;
 		val = mdesc_get_property(md, node,
 					 "address-congruence-offset", NULL);
-		m->offset = *val;
+
+		/* The address-congruence-offset property is optional.
+		 * Explicity zero it be identifty this.
+		 */
+		if (val)
+			m->offset = *val;
+		else
+			m->offset = 0UL;
 
 		numadbg("MBLOCK[%d]: base[%llx] size[%llx] offset[%llx]\n",
 			count - 1, m->base, m->size, m->offset);