Module Name: src
Committed By: maxv
Date: Thu Jul 26 08:18:25 UTC 2018
Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c
Log Message:
Merge the blocks. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/xen/x86/x86_xpmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.76 src/sys/arch/xen/x86/x86_xpmap.c:1.77
--- src/sys/arch/xen/x86/x86_xpmap.c:1.76 Thu Jul 26 08:08:24 2018
+++ src/sys/arch/xen/x86/x86_xpmap.c Thu Jul 26 08:18:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.76 2018/07/26 08:08:24 maxv Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.77 2018/07/26 08:18:25 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.76 2018/07/26 08:08:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.77 2018/07/26 08:18:25 maxv Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -693,11 +693,7 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
addr = ((u_long)pdtpe) - KERNBASE;
bt_pgd[pl4_pi(KERNTEXTOFF)] = bt_cpu_pgd[pl4_pi(KERNTEXTOFF)] =
xpmap_ptom_masked(addr) | PG_V | PG_RW;
-#else
- pdtpe = bt_pgd;
-#endif
-#ifdef __x86_64__
/* Level 2 */
pde = (pd_entry_t *)avail;
memset(pde, 0, PAGE_SIZE);
@@ -707,6 +703,8 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
pdtpe[pl3_pi(KERNTEXTOFF)] =
xpmap_ptom_masked(addr) | PG_V | PG_RW;
#elif defined(PAE)
+ pdtpe = bt_pgd;
+
/*
* Our PAE-style level 2, 5 contiguous pages (4 L2 + 1 shadow).
* +-----------------+----------------+---------+
@@ -730,6 +728,7 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
addr += PAGE_SIZE;
pdtpe[3] = xpmap_ptom_masked(addr) | PG_V;
#else
+ pdtpe = bt_pgd;
pde = bt_pgd;
#endif
