From f2b05c30fe12072b9053e83a737da95ab79f8f96 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 16 Nov 2012 19:38:42 -0800
Subject: [PATCH] --- yaml --- r: 356185 b: refs/heads/master c:
 28b6ff667013735dd2e68edd105d17cdf3835dcb h: refs/heads/master i:   356183:
 d2482b939030393b4ae8e5c6a088fb6c1155fafa v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/mm/init.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1cba8719adf7..ae86b6d1951a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22ddfcaa0dbae992332381d41b8a1fbc72269a13
+refs/heads/master: 28b6ff667013735dd2e68edd105d17cdf3835dcb
diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c
index 9e17f9e18a21..dbef4ffe8d31 100644
--- a/trunk/arch/x86/mm/init.c
+++ b/trunk/arch/x86/mm/init.c
@@ -234,8 +234,8 @@ static void __init find_early_table_space(struct map_range *mr, int nr_range)
 #ifdef CONFIG_X86_32
 	/* for fixmap */
 	tables += roundup(__end_of_fixed_addresses * sizeof(pte_t), PAGE_SIZE);
-#endif
 	good_end = max_pfn_mapped << PAGE_SHIFT;
+#endif
 
 	base = memblock_find_in_range(start, good_end, tables, PAGE_SIZE);
 	if (!base)