diff --git a/[refs] b/[refs]
index c7c3325c1170..aafaeaeb548c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49
+refs/heads/master: 8548c84da2f47e71bbbe300f55edb768492575f7
diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c
index 30326443ab81..87488b93a65c 100644
--- a/trunk/arch/x86/mm/init.c
+++ b/trunk/arch/x86/mm/init.c
@@ -63,9 +63,8 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
 #ifdef CONFIG_X86_32
 	/* for fixmap */
 	tables += roundup(__end_of_fixed_addresses * sizeof(pte_t), PAGE_SIZE);
-
-	good_end = max_pfn_mapped << PAGE_SHIFT;
 #endif
+	good_end = max_pfn_mapped << PAGE_SHIFT;
 
 	base = memblock_find_in_range(start, good_end, tables, PAGE_SIZE);
 	if (base == MEMBLOCK_ERROR)