From 45fad6efc6f62649f394462277d32b6891057b26 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 4 Feb 2008 16:48:10 +0100
Subject: [PATCH] --- yaml --- r: 82913 b: refs/heads/master c:
 7b610eec7a06ede64f71459e7f412dfd96f4cc5e h: refs/heads/master i:   82911:
 38fdb78e95e50e08a03369abf490c779078ba01d v: v3

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

diff --git a/[refs] b/[refs]
index f881ca858c1f..949cffa5babb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87f7f8fe328388a1430a4c27cbe684f3925fd8a5
+refs/heads/master: 7b610eec7a06ede64f71459e7f412dfd96f4cc5e
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index 4f033505127e..bb55a78dcd62 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -237,6 +237,7 @@ static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
 	if (!SHARED_KERNEL_PMD) {
 		struct page *page;
 
+		address = __pa(address);
 		list_for_each_entry(page, &pgd_list, lru) {
 			pgd_t *pgd;
 			pud_t *pud;
@@ -351,7 +352,7 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,
 
 static int split_large_page(pte_t *kpte, unsigned long address)
 {
-	unsigned long flags, addr, pfn, pfninc = 1;
+	unsigned long flags, pfn, pfninc = 1;
 	gfp_t gfp_flags = GFP_KERNEL;
 	unsigned int i, level;
 	pte_t *pbase, *tmp;
@@ -374,8 +375,6 @@ static int split_large_page(pte_t *kpte, unsigned long address)
 	if (tmp != kpte)
 		goto out_unlock;
 
-	address = __pa(address);
-	addr = address & PMD_PAGE_MASK;
 	pbase = (pte_t *)page_address(base);
 #ifdef CONFIG_X86_32
 	paravirt_alloc_pt(&init_mm, page_to_pfn(base));
@@ -386,7 +385,6 @@ static int split_large_page(pte_t *kpte, unsigned long address)
 	if (level == PG_LEVEL_1G) {
 		pfninc = PMD_PAGE_SIZE >> PAGE_SHIFT;
 		pgprot_val(ref_prot) |= _PAGE_PSE;
-		addr &= PUD_PAGE_MASK;
 	}
 #endif