Merge branch 'linus' into x86/header-guards

[sfrench/cifs-2.6.git] / include / asm-x86 / xen / page.h

diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h
index a17a86433c774c1ef9e9efb563188be63ce2e33c..c50185dccec192bdef7e0d936863d5503cc304d5 100644 (file)
--- a/include/asm-x86/xen/page.h
+++ b/include/asm-x86/xen/page.h
@@ -124,7 +124,7 @@ static inline unsigned long mfn_to_local_pfn(unsigned long mfn)
 
 static inline unsigned long pte_mfn(pte_t pte)
 {
-       return (pte.pte & PTE_MASK) >> PAGE_SHIFT;
+       return (pte.pte & PTE_PFN_MASK) >> PAGE_SHIFT;
 }
 
 static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)