diff --git a/[refs] b/[refs]
index 1d394995d950..32e252cb208c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 881d90d0daaeac018b0d5beb739dd825ccee0143
+refs/heads/master: 6724a1d2fc6b40d55f232b8dacc12a915878bdc7
diff --git a/trunk/include/asm-x86/page.h b/trunk/include/asm-x86/page.h
index 00353eb5666d..ef393c3df902 100644
--- a/trunk/include/asm-x86/page.h
+++ b/trunk/include/asm-x86/page.h
@@ -22,7 +22,7 @@
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
 
-#define __PHYSICAL_MASK		((_AC(1,UL) << __PHYSICAL_MASK_SHIFT) - 1)
+#define __PHYSICAL_MASK		_AT(phys_addr_t, (_AC(1,ULL) << __PHYSICAL_MASK_SHIFT) - 1)
 #define __VIRTUAL_MASK		((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1)
 
 #ifndef __ASSEMBLY__