From a3b2681f665efac6256e3f5f8fd8cea6811295a2 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 10 Jun 2008 16:38:41 +0200
Subject: [PATCH] --- yaml --- r: 99753 b: refs/heads/master c:
 df5f6c212cc049d1989b5ce71bb863a367c261e9 h: refs/heads/master i:   99751:
 f7e4bf0bf2b100684104ec553353c321f10d1559 v: v3

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

diff --git a/[refs] b/[refs]
index 088d3c7e8b3c..317da57af0ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12448e3ef3ae7fca7a7ad205084f45a67dcc4356
+refs/heads/master: df5f6c212cc049d1989b5ce71bb863a367c261e9
diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c
index a706e9057ba5..68aba413d403 100644
--- a/trunk/arch/x86/kernel/e820.c
+++ b/trunk/arch/x86/kernel/e820.c
@@ -635,12 +635,8 @@ void __init early_res_to_bootmem(u64 start, u64 end)
 			continue;
 		printk(KERN_INFO "  early res: %d [%llx-%llx] %s\n", i,
 			final_start, final_end - 1, r->name);
-#ifdef CONFIG_X86_64
-		reserve_bootmem_generic(final_start, final_end - final_start);
-#else
 		reserve_bootmem(final_start, final_end - final_start,
 				BOOTMEM_DEFAULT);
-#endif
 	}
 }