Mailing List Archive

# HG changeset patch
# User Ian Campbell <ian.campbell@xensource.com>
# Date 1180088642 -3600
# Node ID ca62b4b4f76237016d9b61cd58b5e4480b25b673
# Parent 3fcd0b9fd083aca0bbf2be6085269e39434308c6
LINUX/x86_64: Cleanup 15129:a40967e39652 by using __pgd rather than
abusing mk_kernel_pgd.

Also set the user bit on the vsyscall entry in the user pgd.

Both changes suggested by Jan Beulich.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
---
linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c | 2 +-
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/pgalloc.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 3fcd0b9fd083 -r ca62b4b4f762 linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c Fri May 25 11:03:40 2007 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c Fri May 25 11:24:02 2007 +0100
@@ -577,7 +577,7 @@ void __init xen_init_pt(void)

/* Construct mapping of initial pte page in our own directories. */
init_level4_pgt[pgd_index(__START_KERNEL_map)] =
- mk_kernel_pgd(__pa_symbol(level3_kernel_pgt) | _PAGE_USER);
+ __pgd(__pa_symbol(level3_kernel_pgt) | _PAGE_TABLE);
level3_kernel_pgt[pud_index(__START_KERNEL_map)] =
__pud(__pa_symbol(level2_kernel_pgt) |
_KERNPG_TABLE);
diff -r 3fcd0b9fd083 -r ca62b4b4f762 linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/pgalloc.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/pgalloc.h Fri May 25 11:03:40 2007 +0100
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/pgalloc.h Fri May 25 11:24:02 2007 +0100
@@ -146,8 +146,8 @@ static inline pgd_t *pgd_alloc(struct mm
/*
* Set level3_user_pgt for vsyscall area
*/
- set_pgd(__user_pgd(pgd) + pgd_index(VSYSCALL_START),
- mk_kernel_pgd(__pa_symbol(level3_user_pgt)));
+ set_pgd(__user_pgd(pgd) + pgd_index(VSYSCALL_START),
+ __pgd(__pa_symbol(level3_user_pgt) | _PAGE_TABLE));
return pgd;
}


_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog