xen: use PTE_MASK in pte_mfn()
authorJeremy Fitzhardinge <jeremy@goop.org>
Tue, 20 May 2008 07:26:24 +0000 (08:26 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 14:51:21 +0000 (07:51 -0700)
Use PTE_MASK to extract mfn from pte.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Tested-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/asm-x86/xen/page.h

index 0179930..baf3a4d 100644 (file)
@@ -127,7 +127,7 @@ static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn)
 
 static inline unsigned long pte_mfn(pte_t pte)
 {
-       return (pte.pte & ~_PAGE_NX) >> PAGE_SHIFT;
+       return (pte.pte & PTE_MASK) >> PAGE_SHIFT;
 }
 
 static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)