summaryrefslogtreecommitdiff
path: root/sys/dev/nvmm
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2019-12-10 18:06:50 +0000
committerad <ad@NetBSD.org>2019-12-10 18:06:50 +0000
commit4df18518d5baebaf5ffac784ef2f437bb0a57ad2 (patch)
tree7ab4621aabbbf2ddeaded387b06fa3229639e884 /sys/dev/nvmm
parent3b29c291959128e8bdaec61170c1653a669f86cc (diff)
pg->phys_addr > VM_PAGE_TO_PHYS(pg)
Diffstat (limited to 'sys/dev/nvmm')
-rw-r--r--sys/dev/nvmm/x86/nvmm_x86_svm.c6
-rw-r--r--sys/dev/nvmm/x86/nvmm_x86_vmx.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/nvmm/x86/nvmm_x86_svm.c b/sys/dev/nvmm/x86/nvmm_x86_svm.c
index 03997ee31d8..36ae24a4f32 100644
--- a/sys/dev/nvmm/x86/nvmm_x86_svm.c
+++ b/sys/dev/nvmm/x86/nvmm_x86_svm.c
@@ -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 @@ svm_memalloc(paddr_t *pa, vaddr_t *va, size_t npages)
&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 --git a/sys/dev/nvmm/x86/nvmm_x86_vmx.c b/sys/dev/nvmm/x86/nvmm_x86_vmx.c
index 3c33b0ebf8a..64ae5c96ce2 100644
--- a/sys/dev/nvmm/x86/nvmm_x86_vmx.c
+++ b/sys/dev/nvmm/x86/nvmm_x86_vmx.c
@@ -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 @@ vmx_memalloc(paddr_t *pa, vaddr_t *va, size_t npages)
&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)