From 71a8ed86df84be797dc84175abfefe310441a2ea Mon Sep 17 00:00:00 2001
From: Dave Hansen <dave@linux.vnet.ibm.com>
Date: Tue, 22 Jan 2013 13:24:32 -0800
Subject: [PATCH] --- yaml --- r: 356167 b: refs/heads/master c:
 f3c4fbb68e93b10c781c0cc462a9d80770244da6 h: refs/heads/master i:   356165:
 732f86d266287ff408ec586fa2a8cccae20448eb   356163:
 f8919e4ea26acd0a1e80fa16c2a2f78d1ded81b9   356159:
 a57e6969266f04895ef2e0011e774eef0b4b508f v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/mm/pageattr.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e5fd05ab098e..f86970e2a93d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cbeb51b860c57ba8b2ae50c4016ee7a41f5fbd5
+refs/heads/master: f3c4fbb68e93b10c781c0cc462a9d80770244da6
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index 40f92f3aea54..2a5c9ab710b9 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -396,7 +396,7 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,
 	pte_t new_pte, old_pte, *tmp;
 	pgprot_t old_prot, new_prot, req_prot;
 	int i, do_split = 1;
-	unsigned int level;
+	enum pg_level level;
 
 	if (cpa->force_split)
 		return 1;
@@ -412,15 +412,12 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,
 
 	switch (level) {
 	case PG_LEVEL_2M:
-		psize = PMD_PAGE_SIZE;
-		pmask = PMD_PAGE_MASK;
-		break;
 #ifdef CONFIG_X86_64
 	case PG_LEVEL_1G:
-		psize = PUD_PAGE_SIZE;
-		pmask = PUD_PAGE_MASK;
-		break;
 #endif
+		psize = page_level_size(level);
+		pmask = page_level_mask(level);
+		break;
 	default:
 		do_split = -EINVAL;
 		goto out_unlock;