diff --git a/[refs] b/[refs]
index 48a8f537ac8d..d42a6bbe054c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38472311679d8784c2934d071ddda23d9b3fe264
+refs/heads/master: b7fff536d0ad45c4810f9b99845c707ceadc3afc
diff --git a/trunk/include/asm-x86/page.h b/trunk/include/asm-x86/page.h
index 3a00d0d9dfd3..91920565a575 100644
--- a/trunk/include/asm-x86/page.h
+++ b/trunk/include/asm-x86/page.h
@@ -11,7 +11,7 @@
 #ifdef __KERNEL__
 
 #define PHYSICAL_PAGE_MASK	(PAGE_MASK & __PHYSICAL_MASK)
-#define PTE_MASK		PHYSICAL_PAGE_MASK
+#define PTE_MASK		(_AT(long, PHYSICAL_PAGE_MASK))
 
 #define LARGE_PAGE_SIZE		(_AC(1,UL) << PMD_SHIFT)
 #define LARGE_PAGE_MASK		(~(LARGE_PAGE_SIZE-1))