From 85da71964c5660bc82f566f7f2c41c1fae1775fb Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Wed, 29 May 2013 13:08:39 +0200 Subject: [PATCH] --- yaml --- r: 376567 b: refs/heads/master c: e86cbd8765bd2e1f9eeb209822449c9b1e5958cf h: refs/heads/master i: 376565: 357055716452a4d34bbfbe28886842ddc6c4d00a 376563: d79c49b6eb2db07edce54b3392cf99d509a5323f 376559: 2fd211b761626409439911f42417dbb1abf484c5 v: v3 --- [refs] | 2 +- trunk/arch/s390/mm/pgtable.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7e4562d3cd26..18f39fa05937 100644 --- 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 index 18dc417aaf79..a938b548f07e 100644 --- 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);