---

yaml --- r: 376567 b: refs/heads/master c: e86cbd8 h: refs/heads/master i: 376565: 3570557 376563: d79c49b 376559: 2fd211b v: v3
git-mirror · May 31, 2013 · 85da719 · 85da719
1 parent 02957cf
commit 85da719
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b811bae69cf30e0a9676d7dcafb0cf16f13b3bc
+refs/heads/master: e86cbd8765bd2e1f9eeb209822449c9b1e5958cf
diff --git a/trunk/arch/s390/mm/pgtable.c b/trunk/arch/s390/mm/pgtable.c
@@ -492,7 +492,7 @@ static int gmap_connect_pgtable(unsigned long address, unsigned long segment,
 	mp = (struct gmap_pgtable *) page->index;
 	rmap->gmap = gmap;
 	rmap->entry = segment_ptr;
-	rmap->vmaddr = address;
+	rmap->vmaddr = address & PMD_MASK;
 	spin_lock(&mm->page_table_lock);
 	if (*segment_ptr == segment) {
 		list_add(&rmap->list, &mp->mapper);