Module Name: src
Committed By: maxv
Date: Tue Nov 15 17:01:12 UTC 2016
Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c
Log Message:
Mmh, apparently I didn't properly test my previous change since it does not
compile anymore
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 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.66 src/sys/arch/xen/x86/x86_xpmap.c:1.67
--- src/sys/arch/xen/x86/x86_xpmap.c:1.66 Tue Nov 15 15:37:20 2016
+++ src/sys/arch/xen/x86/x86_xpmap.c Tue Nov 15 17:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.66 2016/11/15 15:37:20 maxv Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.67 2016/11/15 17:01:12 maxv Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert <[email protected]>
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.66 2016/11/15 15:37:20 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.67 2016/11/15 17:01:12 maxv Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -799,7 +799,7 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
avail += PAGE_SIZE;
addr = ((u_long)pdtpe) - KERNBASE;
- bt_pgd[L4_SLOT_KERNBASE] = bt_cpu_pgd[L4_SLOT_KERNBASE] =
+ bt_pgd[pl4_pi(KERNTEXTOFF)] = bt_cpu_pgd[pl4_pi(KERNTEXTOFF)] =
xpmap_ptom_masked(addr) | PG_k | PG_V | PG_RW;
#else
pdtpe = bt_pgd;
@@ -812,7 +812,7 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
avail += PAGE_SIZE;
addr = ((u_long)pde) - KERNBASE;
- pdtpe[L3_SLOT_KERNBASE] =
+ pdtpe[pl3_pi(KERNTEXTOFF)] =
xpmap_ptom_masked(addr) | PG_k | PG_V | PG_RW;
#elif defined(PAE)
/* Our PAE-style level 2: 5 contigous pages (4 L2 + 1 shadow) */
