From 43090b025e4d9239ea754205eea146ae5efaaf19 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Sun, 30 Oct 2011 15:16:08 +0100
Subject: [PATCH] --- yaml --- r: 272051 b: refs/heads/master c:
 e73b7fffe487c315fd1a4fa22282e3362b440a06 h: refs/heads/master i:   272049:
 215c0cd646aaff10ac5415a4e3dcad2ebc8f159a   272047:
 8e86506014d386ede2cb0db6fb04ad91fb861979 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/mm/pgtable.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3fe774f844d4..8d75e8f9d2f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a45aff5285871bf7be1781d9462d3fdbb6c913f9
+refs/heads/master: e73b7fffe487c315fd1a4fa22282e3362b440a06
diff --git a/trunk/arch/s390/mm/pgtable.c b/trunk/arch/s390/mm/pgtable.c
index 5d56c2b95b14..529a08838376 100644
--- a/trunk/arch/s390/mm/pgtable.c
+++ b/trunk/arch/s390/mm/pgtable.c
@@ -662,8 +662,9 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table)
 
 void __tlb_remove_table(void *_table)
 {
-	void *table = (void *)((unsigned long) _table & PAGE_MASK);
-	unsigned type = (unsigned long) _table & ~PAGE_MASK;
+	const unsigned long mask = (FRAG_MASK << 4) | FRAG_MASK;
+	void *table = (void *)((unsigned long) _table & ~mask);
+	unsigned type = (unsigned long) _table & mask;
 
 	if (type)
 		__page_table_free_rcu(table, type);