From 172fb1ee98f2854430fb51b2380d3ef0aa565451 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 20 May 2008 08:26:23 +0100
Subject: [PATCH] --- yaml --- r: 97012 b: refs/heads/master c:
 ba23cef5c23cf1e9298032037d919157553d1211 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ebaf5b1b022a..d0d9f328ef34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86aaf4fd4ea25ddde05772d03b93dbce23c0ead1
+refs/heads/master: ba23cef5c23cf1e9298032037d919157553d1211
diff --git a/trunk/include/asm-x86/pgtable.h b/trunk/include/asm-x86/pgtable.h
index b816134f753a..97c271b2910b 100644
--- a/trunk/include/asm-x86/pgtable.h
+++ b/trunk/include/asm-x86/pgtable.h
@@ -305,7 +305,7 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
 	return __pgprot(preservebits | addbits);
 }
 
-#define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX))
+#define pte_pgprot(x) __pgprot(pte_val(x) & ~PTE_MASK)
 
 #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask)