diff --git a/[refs] b/[refs]
index af86d260c589..e73afdc9c934 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c93c82bbea20bef627dbe8e34a4bc8e526217104
+refs/heads/master: c6ca18eb759c43ae20d953ef90c3de4557f9342a
diff --git a/trunk/include/asm-x86/pgtable.h b/trunk/include/asm-x86/pgtable.h
index 0c3ecca0f79c..b4ee5939afe5 100644
--- a/trunk/include/asm-x86/pgtable.h
+++ b/trunk/include/asm-x86/pgtable.h
@@ -187,6 +187,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 	return __pte(val);
 }
 
+#define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX))
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else  /* !CONFIG_PARAVIRT */
diff --git a/trunk/include/asm-x86/pgtable_64.h b/trunk/include/asm-x86/pgtable_64.h
index 139da50cd510..df1fcbd12e43 100644
--- a/trunk/include/asm-x86/pgtable_64.h
+++ b/trunk/include/asm-x86/pgtable_64.h
@@ -120,8 +120,6 @@ static inline void native_pgd_clear(pgd_t * pgd)
 
 #define pte_same(a, b)		((a).pte == (b).pte)
 
-#define pte_pgprot(a)	(__pgprot((a).pte & ~PHYSICAL_PAGE_MASK))
-
 #endif /* !__ASSEMBLY__ */
 
 #define PMD_SIZE	(_AC(1,UL) << PMD_SHIFT)