[PATCH] x86: fix size for ex trampoline with 32bit

[Yinghai Lu]

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 <yin...@kernel.org>

---
arch/x86/kernel/e820.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/kernel/e820.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820.c
+++ linux-2.6/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

{}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[H. Peter Anvin]

On 12/20/2009 11:27 PM, Yinghai Lu wrote:
>
>
> 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
>

2*PAGE_SIZE?

-hpa

--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.

[Yinghai Lu]

H. Peter Anvin wrote:
> On 12/20/2009 11:27 PM, Yinghai Lu wrote:
>>
>> 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
>>
>
> 2*PAGE_SIZE?

should be the same.

just try to restore to old one before i broke it.

YH