From fec92cb18beeb4aa40674395b450b33f637537b3 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 30 Jan 2008 13:32:57 +0100
Subject: [PATCH] --- yaml --- r: 80217 b: refs/heads/master c:
 c3bcfb57e1e64b9b2f8b2d90564826637e21c5ea h: refs/heads/master i:   80215:
 1854901e85defcf35da9fc7fb980250c00034086 v: v3

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

diff --git a/[refs] b/[refs]
index a5a9beff029f..13138cbf4a07 100644
--- 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
index 948a33414118..9816346f7df6 100644
--- 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;