Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dad0fd5 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

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: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1261525263-13763-2-git-send-email-yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent a8fe9ea2

arch/x86/kernel/e820.c

+2 −2
Original line number Diff line number Diff line
@@ -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



	{}