aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/e820.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-09 03:39:43 -0500
committerLen Brown <len.brown@intel.com>2009-01-09 03:39:43 -0500
commitb2576e1d4408e134e2188c967b1f28af39cd79d4 (patch)
tree004f3c82faab760f304ce031d6d2f572e7746a50 /arch/x86/kernel/e820.c
parent3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff)
parent2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff)
Merge branch 'linus' into release
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r--arch/x86/kernel/e820.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 74c6a21fdc8c..e85826829cf2 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -698,22 +698,6 @@ struct early_res {
698}; 698};
699static struct early_res early_res[MAX_EARLY_RES] __initdata = { 699static struct early_res early_res[MAX_EARLY_RES] __initdata = {
700 { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */ 700 { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */
701#if defined(CONFIG_X86_64) && defined(CONFIG_X86_TRAMPOLINE)
702 { TRAMPOLINE_BASE, TRAMPOLINE_BASE + 2 * PAGE_SIZE, "TRAMPOLINE" },
703#endif
704#if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
705 /*
706 * But first pinch a few for the stack/trampoline stuff
707 * FIXME: Don't need the extra page at 4K, but need to fix
708 * trampoline before removing it. (see the GDT stuff)
709 */
710 { PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE" },
711 /*
712 * Has to be in very low memory so we can execute
713 * real-mode AP code.
714 */
715 { TRAMPOLINE_BASE, TRAMPOLINE_BASE + PAGE_SIZE, "TRAMPOLINE" },
716#endif
717 {} 701 {}
718}; 702};
719 703