[src/trunk]: src/sys/dev/nvmm/x86 pg->phys_addr > VM_PAGE_TO_PHYS(pg)

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

details:   https://anonhg.NetBSD.org/src/rev/bc516d1ad12d
branches:  trunk
changeset: 847109:bc516d1ad12d
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Dec 10 18:06:50 2019 +0000

description:
pg->phys_addr > VM_PAGE_TO_PHYS(pg)

diffstat:

 sys/dev/nvmm/x86/nvmm_x86_svm.c |  6 +++---
 sys/dev/nvmm/x86/nvmm_x86_vmx.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 67073970a27b -r bc516d1ad12d sys/dev/nvmm/x86/nvmm_x86_svm.c
--- a/sys/dev/nvmm/x86/nvmm_x86_svm.c   Tue Dec 10 18:02:14 2019 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_svm.c   Tue Dec 10 18:06:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmm_x86_svm.c,v 1.54 2019/11/20 10:26:56 maxv Exp $   */
+/*     $NetBSD: nvmm_x86_svm.c,v 1.55 2019/12/10 18:06:50 ad Exp $     */
 
 /*
  * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.54 2019/11/20 10:26:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.55 2019/12/10 18:06:50 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1489,7 +1489,7 @@
            &pglist, 1, 0);
        if (ret != 0)
                return ENOMEM;
-       _pa = TAILQ_FIRST(&pglist)->phys_addr;
+       _pa = VM_PAGE_TO_PHYS(TAILQ_FIRST(&pglist));
        _va = uvm_km_alloc(kernel_map, npages * PAGE_SIZE, 0,
            UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
        if (_va == 0)
diff -r 67073970a27b -r bc516d1ad12d sys/dev/nvmm/x86/nvmm_x86_vmx.c
--- a/sys/dev/nvmm/x86/nvmm_x86_vmx.c   Tue Dec 10 18:02:14 2019 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_vmx.c   Tue Dec 10 18:06:50 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmm_x86_vmx.c,v 1.45 2019/11/20 10:26:56 maxv Exp $   */
+/*     $NetBSD: nvmm_x86_vmx.c,v 1.46 2019/12/10 18:06:50 ad Exp $     */
 
 /*
  * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.45 2019/11/20 10:26:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.46 2019/12/10 18:06:50 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2112,7 +2112,7 @@
            &pglist, 1, 0);
        if (ret != 0)
                return ENOMEM;
-       _pa = TAILQ_FIRST(&pglist)->phys_addr;
+       _pa = VM_PAGE_TO_PHYS(TAILQ_FIRST(&pglist));
        _va = uvm_km_alloc(kernel_map, npages * PAGE_SIZE, 0,
            UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
        if (_va == 0)