From 039bb07db91e6c9fb3b42c7abe642f29ec39aead Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu, 16 Dec 2010 10:38:25 -0700
Subject: [PATCH] --- yaml --- r: 223411 b: refs/heads/master c:
 5e52f1c5e85fdc3831eeae8b546577e94a586f81 h: refs/heads/master i:   223409:
 4f6d234f54fcba5afb41d34de1df7eed0df9633c   223407:
 cb1f8eccc7eb61b52a873411e032b4ad65f43fda v: v3

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

diff --git a/[refs] b/[refs]
index e04e7c501a42..391803cb6378 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac57cd5ee1935d1e60de86d75f13f377775f1c96
+refs/heads/master: 5e52f1c5e85fdc3831eeae8b546577e94a586f81
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 21c6746338af..85268f8eadf6 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -769,7 +769,6 @@ 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();