diff --git a/[refs] b/[refs]
index ca326c0b3e7b..12dae7810809 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668231141f307ffd81db075b34bddaedae0ec863
+refs/heads/master: ce8e37cdbdb34a9faeade22e0e6440f0d04560f5
diff --git a/trunk/include/asm-x86/page_32.h b/trunk/include/asm-x86/page_32.h
index 424e82f8ae27..ccf0ba3c3aba 100644
--- a/trunk/include/asm-x86/page_32.h
+++ b/trunk/include/asm-x86/page_32.h
@@ -14,7 +14,8 @@
 #define __PAGE_OFFSET		_AC(CONFIG_PAGE_OFFSET, UL)
 
 #ifdef CONFIG_X86_PAE
-#define __PHYSICAL_MASK_SHIFT	36
+/* 44=32+12, the limit we can fit into an unsigned long pfn */
+#define __PHYSICAL_MASK_SHIFT	44
 #define __VIRTUAL_MASK_SHIFT	32
 #define PAGETABLE_LEVELS	3