diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-12-22 15:40:39 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-01-04 13:20:11 -0800 |
| commit | 9dad0fd5a73d4048dff18069733c0b515f68df74 (patch) | |
| tree | 579b172b7bd7fc1dd090146c23c3f26f7e4869b0 /arch/x86 | |
| parent | a8fe9ea200ea21421ea750423d1d4d4f7ce037cf (diff) | |
| download | talos-op-linux-9dad0fd5a73d4048dff18069733c0b515f68df74.tar.gz talos-op-linux-9dad0fd5a73d4048dff18069733c0b515f68df74.zip | |
x86: Fix size for ex trampoline with 32bit
fix for error that is introduced by
| x86: Use find_e820() instead of hard coded trampoline address
it should end with PAGE_SIZE + PAGE_SIZE
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1261525263-13763-2-git-send-email-yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/e820.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 05ed7ab2ca48..a1a7876cadcb 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -733,13 +733,13 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { { 0, PAGE_SIZE, "BIOS data page", 1 }, /* BIOS data page */ -#ifdef CONFIG_X86_32 +#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, "EX TRAMPOLINE", 1 }, + { PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE", 1 }, #endif {} |
