From b21f3f393cc6f33ce4cbc6f15b0caf6441827c4a Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 24 Jan 2013 12:19:50 -0800 Subject: [PATCH] --- yaml --- r: 356234 b: refs/heads/master c: 9735e91e9c29c0d8fe432aef1152e43e50bdb316 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/realmode/init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 470746084004..6010cc0a81e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa2bbce985ca97943305cdc81d9626e6810ed7f2 +refs/heads/master: 9735e91e9c29c0d8fe432aef1152e43e50bdb316 diff --git a/trunk/arch/x86/realmode/init.c b/trunk/arch/x86/realmode/init.c index c44ea7cf5741..ffee06ac7de9 100644 --- a/trunk/arch/x86/realmode/init.c +++ b/trunk/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 }