From 93544632aa2715a383a008f45a074b0c9ab9c74f Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 20 May 2008 08:26:24 +0100
Subject: [PATCH] --- yaml --- r: 97013 b: refs/heads/master c:
 cbb3077cbe718795d7ae5d78ed11659ca73c97b9 h: refs/heads/master i:   97011:
 8d8fc3503896091281dac448fa2ad570e954cb57 v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-x86/xen/page.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d0d9f328ef34..3d72deab9d0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba23cef5c23cf1e9298032037d919157553d1211
+refs/heads/master: cbb3077cbe718795d7ae5d78ed11659ca73c97b9
diff --git a/trunk/include/asm-x86/xen/page.h b/trunk/include/asm-x86/xen/page.h
index 01799305f02a..baf3a4dce28c 100644
--- a/trunk/include/asm-x86/xen/page.h
+++ b/trunk/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)