From: Andi Kleen <ak@suse.de>
Date: Wed, 30 Jan 2008 12:33:50 +0000 (+0100)
Subject: x86: cpa: remove unnecessary masking of address
X-Git-Tag: v2.6.25-rc1~1143^2~118
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a3ae91b0a02a4ca0088f30d572c848f5d522573a;p=linux-2.6-omap-h63xx.git

x86: cpa: remove unnecessary masking of address

virt_to_page does not care about the bits below the page granuality.
So don't mask them.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/mm/pageattr_64.c b/arch/x86/mm/pageattr_64.c
index b21a874c2dd..4d172881af7 100644
--- a/arch/x86/mm/pageattr_64.c
+++ b/arch/x86/mm/pageattr_64.c
@@ -148,7 +148,7 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
 	if (!kpte)
 		return 0;
 
-	kpte_page = virt_to_page(((unsigned long)kpte) & PAGE_MASK);
+	kpte_page = virt_to_page(kpte);
 	BUG_ON(PageLRU(kpte_page));
 	BUG_ON(PageCompound(kpte_page));
 	if (pgprot_val(prot) != pgprot_val(ref_prot)) {