---

yaml --- r: 80217 b: refs/heads/master c: c3bcfb5 h: refs/heads/master i: 80215: 1854901 v: v3
git-mirror · Jan 30, 2008 · fec92cb · fec92cb
1 parent 9b75759
commit fec92cb
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: 4614139c6a74fe02c85f702ba9c0e57f8e38647e
+refs/heads/master: c3bcfb57e1e64b9b2f8b2d90564826637e21c5ea
diff --git a/trunk/include/asm-x86/pgtable-3level.h b/trunk/include/asm-x86/pgtable-3level.h
@@ -155,7 +155,7 @@ static inline int pte_none(pte_t pte)
 
 static inline unsigned long pte_pfn(pte_t pte)
 {
-	return pte_val(pte) >> PAGE_SHIFT;
+	return (pte_val(pte) & ~_PAGE_NX) >> PAGE_SHIFT;
 }
 
 extern unsigned long long __supported_pte_mask;