aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-05-20 08:26:24 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-20 07:51:21 -0700
commitcbb3077cbe718795d7ae5d78ed11659ca73c97b9 (patch)
tree84b121685718028c927872ed2a9c93cf1caf8539 /include/asm-x86/xen
parentx86: use PTE_MASK rather than ad-hoc mask (diff)
downloadlinux-dev-cbb3077cbe718795d7ae5d78ed11659ca73c97b9.tar.xz
linux-dev-cbb3077cbe718795d7ae5d78ed11659ca73c97b9.zip
xen: use PTE_MASK in pte_mfn()
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>
Diffstat (limited to 'include/asm-x86/xen')
-rw-r--r--include/asm-x86/xen/page.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h
index 01799305f02a..baf3a4dce28c 100644
--- a/include/asm-x86/xen/page.h
+++ b/include/asm-x86/xen/page.h
@@ -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)