[src/trunk]: src/sys/arch/i386/i386 pg->phys_addr -> VM_PAGE_TO_PHYS(pg)

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/279e7ef41408
branches:  trunk
changeset: 967474:279e7ef41408
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Dec 10 18:02:14 2019 +0000

description:
pg->phys_addr -> VM_PAGE_TO_PHYS(pg)

diffstat:

 sys/arch/arm/include/arm32/pmap.h |  4 ++--
 sys/arch/i386/i386/machdep.c      |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 4fc53cae8da7 -r 279e7ef41408 sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Tue Dec 10 18:00:17 2019 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Tue Dec 10 18:02:14 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.156 2018/10/18 09:01:52 skrll Exp $ */
+/*     $NetBSD: pmap.h,v 1.157 2019/12/10 18:02:14 ad Exp $    */
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -1158,7 +1158,7 @@
  */
 #if ARM_MMU_V6 > 0
 #define        VM_MDPAGE_PVH_ATTRS_INIT(pg) \
-       (pg)->mdpage.pvh_attrs = (pg)->phys_addr & arm_cache_prefer_mask
+       (pg)->mdpage.pvh_attrs = VM_PAGE_TO_PHYS(pg) & arm_cache_prefer_mask
 #else
 #define        VM_MDPAGE_PVH_ATTRS_INIT(pg) \
        (pg)->mdpage.pvh_attrs = 0
diff -r 4fc53cae8da7 -r 279e7ef41408 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Tue Dec 10 18:00:17 2019 +0000
+++ b/sys/arch/i386/i386/machdep.c      Tue Dec 10 18:02:14 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.823 2019/10/18 01:38:28 manu Exp $       */
+/*     $NetBSD: machdep.c,v 1.824 2019/12/10 18:04:54 ad Exp $ */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009, 2017
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.823 2019/10/18 01:38:28 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.824 2019/12/10 18:04:54 ad Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_freebsd.h"
@@ -1680,7 +1680,7 @@
                panic("%s: failed to allocate L3 pglist for CPU %d (ret %d)\n",
                        __func__, cpu_index(ci), ret);
 
-       ci->ci_pae_l3_pdirpa = vmap->phys_addr;
+       ci->ci_pae_l3_pdirpa = VM_PAGE_TO_PHYS(vmap);
 
        ci->ci_pae_l3_pdir = (paddr_t *)uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
                UVM_KMF_VAONLY | UVM_KMF_NOWAIT);