diff options
| author | H. Peter Anvin | 2010-02-11 01:55:28 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2010-02-11 01:55:28 +0100 |
| commit | 84abd88a70090cf00f9e45c3a81680874f17626e (patch) | |
| tree | 4f58b80057f6e1f5817af1dc33a5458b3dfc9a99 /arch/x86/kernel/e820.c | |
| parent | x86: Use the generic page_is_ram() (diff) | |
| parent | Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-qcow2-linux-84abd88a70090cf00f9e45c3a81680874f17626e.tar.gz kernel-qcow2-linux-84abd88a70090cf00f9e45c3a81680874f17626e.tar.xz kernel-qcow2-linux-84abd88a70090cf00f9e45c3a81680874f17626e.zip | |
Merge remote branch 'linus/master' into x86/bootmem
Diffstat (limited to 'arch/x86/kernel/e820.c')
| -rw-r--r-- | arch/x86/kernel/e820.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 230687ba5ba5..a966b753e496 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -732,7 +732,7 @@ core_initcall(e820_mark_nvs_memory); /* * Early reserved memory areas. */ -#define MAX_EARLY_RES 20 +#define MAX_EARLY_RES 32 struct early_res { u64 start, end; @@ -740,7 +740,16 @@ struct early_res { char overlap_ok; }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { - { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */ + { 0, PAGE_SIZE, "BIOS data page", 1 }, /* BIOS data page */ +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_TRAMPOLINE) + /* + * But first pinch a few for the stack/trampoline stuff + * FIXME: Don't need the extra page at 4K, but need to fix + * trampoline before removing it. (see the GDT stuff) + */ + { PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE", 1 }, +#endif + {} }; |