From 3579bb87e37d95e3daa13908bed30f385911bd34 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 16 Nov 2012 19:38:46 -0800
Subject: [PATCH] --- yaml --- r: 356189 b: refs/heads/master c:
 dd7dfad7fb297b1746bcdbebbdc970d723a635bd h: refs/heads/master i:   356187:
 0d40a9b61977708198d931fbf7bada3b4eacd5c5 v: v3

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

diff --git a/[refs] b/[refs]
index da367ab2366e..f35cd73b3410 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab9519376e86fbbf3c64e5a2b8b005958ea3e9cc
+refs/heads/master: dd7dfad7fb297b1746bcdbebbdc970d723a635bd
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 23b079fb93fc..4bd89218cbc3 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -890,7 +890,7 @@ void __init setup_arch(char **cmdline_p)
 
 	cleanup_highmap();
 
-	memblock.current_limit = get_max_mapped();
+	memblock.current_limit = ISA_END_ADDRESS;
 	memblock_x86_fill();
 
 	/*