Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/xen/x86 Mmh, apparently I didn't properly test my p...



details:   https://anonhg.NetBSD.org/src/rev/873934380da1
branches:  trunk
changeset: 819057:873934380da1
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue Nov 15 17:01:12 2016 +0000

description:
Mmh, apparently I didn't properly test my previous change since it does not
compile anymore

diffstat:

 sys/arch/xen/x86/x86_xpmap.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r a7bcb7689bda -r 873934380da1 sys/arch/xen/x86/x86_xpmap.c
--- a/sys/arch/xen/x86/x86_xpmap.c      Tue Nov 15 15:37:20 2016 +0000
+++ b/sys/arch/xen/x86/x86_xpmap.c      Tue Nov 15 17:01:12 2016 +0000
@@ -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 <mro%adviseo.fr@localhost>
@@ -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 @@
        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 @@
        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) */



Home | Main Index | Thread Index | Old Index