lkml.org 
[lkml]   [2010]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 01/29] 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>
    ---
    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 05ed7ab..a1a7876 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

    {}
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-01-04 04:09    [W:0.059 / U:1.980 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site