---

yaml --- r: 97013 b: refs/heads/master c: cbb3077 h: refs/heads/master i: 97011: 8d8fc35 v: v3
git-mirror · May 20, 2008 · 9354463 · 9354463
1 parent 172fb1e
commit 9354463
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)