---

yaml --- r: 97012 b: refs/heads/master c: ba23cef h: refs/heads/master v: v3
git-mirror · May 20, 2008 · 172fb1e · 172fb1e
1 parent 8d8fc35
commit 172fb1e
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: 86aaf4fd4ea25ddde05772d03b93dbce23c0ead1
+refs/heads/master: ba23cef5c23cf1e9298032037d919157553d1211
diff --git 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)