diff --git a/[refs] b/[refs]
index 1f812055b23a..eb557acfb96c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd3a99c9d1851182f73d0a024dc5bdb0a470e8c
+refs/heads/master: 1bb271db63c356212564aad050b2cf026f800858
diff --git a/trunk/include/asm-x86/page.h b/trunk/include/asm-x86/page.h
index 76b35e636d7d..223146da2faf 100644
--- a/trunk/include/asm-x86/page.h
+++ b/trunk/include/asm-x86/page.h
@@ -29,7 +29,7 @@
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
 
-#define __PHYSICAL_MASK		((((phys_addr_t)1) << __PHYSICAL_MASK_SHIFT) - 1)
+#define __PHYSICAL_MASK		((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1)
 #define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)
 
 #ifndef __ASSEMBLY__