diff --git a/[refs] b/[refs]
index 438f64ebb9b1..55889aa309ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 895bdc29956e5c9e9e101b2b1c2f0ed34130f945
+refs/heads/master: 1e8e23bc469a11fc190a6bace857075d83dc2555
diff --git a/trunk/include/asm-x86/pgtable.h b/trunk/include/asm-x86/pgtable.h
index 2f93723a3e18..2726ddc457fd 100644
--- a/trunk/include/asm-x86/pgtable.h
+++ b/trunk/include/asm-x86/pgtable.h
@@ -189,6 +189,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 
 #define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX))
 
+#define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask)
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else  /* !CONFIG_PARAVIRT */