From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Wed, 29 May 2013 11:08:39 +0000 (+0200)
Subject: s390/pgtable: Fix gmap notifier address
X-Git-Tag: upstream/snapshot3+hdmi~4989^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e86cbd8765bd2e1f9eeb209822449c9b1e5958cf;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

s390/pgtable: Fix gmap notifier address

The address of the gmap notifier was broken, resulting in
unhandled validity intercepts in KVM. Fix the rmap->vmaddr
to be on a segment boundary.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 18dc417..a938b54 100644
--- a/arch/s390/mm/pgtable.c
+++ b/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);