From 027178ecc08952708b69590e780447d031ed6fad Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 26 Oct 2010 15:41:54 -0600
Subject: [PATCH] --- yaml --- r: 219568 b: refs/heads/master c:
 1af3c2e45e7a641e774bbb84fa428f2f0bf2d9c9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 54f9c6f5837b..b4c8739d5769 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 419afdf53cca794a190014593b4778e2e9d64cf3
+refs/heads/master: 1af3c2e45e7a641e774bbb84fa428f2f0bf2d9c9
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 922b5a1f978b..0fe76df866db 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -788,6 +788,7 @@ void __init setup_arch(char **cmdline_p)
 
 	x86_init.oem.arch_setup();
 
+	resource_alloc_from_bottom = 0;
 	iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1;
 	setup_memory_map();
 	parse_setup_data();