lkml.org 
[lkml]   [2013]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/mm2] x86, 64bit, realmode: Use init_level4_pgt to set trampoline_pgd directly
    Commit-ID:  9735e91e9c29c0d8fe432aef1152e43e50bdb316
    Gitweb: http://git.kernel.org/tip/9735e91e9c29c0d8fe432aef1152e43e50bdb316
    Author: Yinghai Lu <yinghai@kernel.org>
    AuthorDate: Thu, 24 Jan 2013 12:19:50 -0800
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Tue, 29 Jan 2013 15:12:30 -0800

    x86, 64bit, realmode: Use init_level4_pgt to set trampoline_pgd directly

    with #PF handler way to set early page table, level3_ident will go away with
    64bit native path.

    So just use entries in init_level4_pgt to set them in trampoline_pgd.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Link: http://lkml.kernel.org/r/1359058816-7615-10-git-send-email-yinghai@kernel.org
    Cc: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
    Acked-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    arch/x86/realmode/init.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
    index c44ea7c..ffee06a 100644
    --- a/arch/x86/realmode/init.c
    +++ b/arch/x86/realmode/init.c
    @@ -78,8 +78,8 @@ void __init setup_real_mode(void)
    *trampoline_cr4_features = read_cr4();

    trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
    - trampoline_pgd[0] = __pa(level3_ident_pgt) + _KERNPG_TABLE;
    - trampoline_pgd[511] = __pa(level3_kernel_pgt) + _KERNPG_TABLE;
    + trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
    + trampoline_pgd[511] = init_level4_pgt[511].pgd;
    #endif
    }


    \
     
     \ /
      Last update: 2013-01-30 03:01    [W:4.176 / U:0.732 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site