* [PATCH] x86: fix size for ex trampoline with 32bit
@ 2009-12-21 7:27 Yinghai Lu
2009-12-21 17:16 ` H. Peter Anvin
0 siblings, 1 reply; 3+ messages in thread
From: Yinghai Lu @ 2009-12-21 7:27 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin; +Cc: linux-kernel@vger.kernel.org
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>
---
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
{}
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] x86: fix size for ex trampoline with 32bit
2009-12-21 7:27 [PATCH] x86: fix size for ex trampoline with 32bit Yinghai Lu
@ 2009-12-21 17:16 ` H. Peter Anvin
2009-12-21 20:41 ` Yinghai Lu
0 siblings, 1 reply; 3+ messages in thread
From: H. Peter Anvin @ 2009-12-21 17:16 UTC (permalink / raw)
To: Yinghai Lu; +Cc: Ingo Molnar, Thomas Gleixner, linux-kernel@vger.kernel.org
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86: fix size for ex trampoline with 32bit
2009-12-21 17:16 ` H. Peter Anvin
@ 2009-12-21 20:41 ` Yinghai Lu
0 siblings, 0 replies; 3+ messages in thread
From: Yinghai Lu @ 2009-12-21 20:41 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: Ingo Molnar, Thomas Gleixner, linux-kernel@vger.kernel.org
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-21 20:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-21 7:27 [PATCH] x86: fix size for ex trampoline with 32bit Yinghai Lu
2009-12-21 17:16 ` H. Peter Anvin
2009-12-21 20:41 ` Yinghai Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox