Module Name: src
Committed By: skrll
Date: Sun Mar 28 10:29:05 UTC 2021
Modified Files:
src/sys/arch/aarch64/aarch64: vm_machdep.c
src/sys/arch/arm/arm32: vm_machdep.c
src/sys/arch/x86/x86: vm_machdep.c
Log Message:
fix a comment that has been c&p'ed around and not updated
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/aarch64/aarch64/vm_machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/arm/arm32/vm_machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/x86/x86/vm_machdep.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/aarch64/aarch64/vm_machdep.c
diff -u src/sys/arch/aarch64/aarch64/vm_machdep.c:1.10 src/sys/arch/aarch64/aarch64/vm_machdep.c:1.11
--- src/sys/arch/aarch64/aarch64/vm_machdep.c:1.10 Mon Mar 1 11:37:31 2021
+++ src/sys/arch/aarch64/aarch64/vm_machdep.c Sun Mar 28 10:29:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.10 2021/03/01 11:37:31 jmcneill Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.11 2021/03/28 10:29:05 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.10 2021/03/01 11:37:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.11 2021/03/28 10:29:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,8 +227,8 @@ vmapbuf(struct buf *bp, vsize_t len)
bp->b_data = (void *)(taddr + off);
/*
- * The region is locked, so we expect that pmap_pte() will return
- * non-NULL.
+ * The region is locked, so we expect that pmap_extract() will return
+ * true.
*/
while (len) {
(void)pmap_extract(vm_map_pmap(&bp->b_proc->p_vmspace->vm_map),
Index: src/sys/arch/arm/arm32/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.77 src/sys/arch/arm/arm32/vm_machdep.c:1.78
--- src/sys/arch/arm/arm32/vm_machdep.c:1.77 Sat Jun 20 07:10:36 2020
+++ src/sys/arch/arm/arm32/vm_machdep.c Sun Mar 28 10:29:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.77 2020/06/20 07:10:36 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.78 2021/03/28 10:29:05 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.77 2020/06/20 07:10:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.78 2021/03/28 10:29:05 skrll Exp $");
#include "opt_armfpe.h"
#include "opt_cputypes.h"
@@ -223,8 +223,8 @@ vmapbuf(struct buf *bp, vsize_t len)
bp->b_data = (void *)(taddr + off);
/*
- * The region is locked, so we expect that pmap_pte() will return
- * non-NULL.
+ * The region is locked, so we expect that pmap_extract() will return
+ * true.
*/
while (len) {
(void) pmap_extract(pm, faddr, &fpa);
Index: src/sys/arch/x86/x86/vm_machdep.c
diff -u src/sys/arch/x86/x86/vm_machdep.c:1.44 src/sys/arch/x86/x86/vm_machdep.c:1.45
--- src/sys/arch/x86/x86/vm_machdep.c:1.44 Mon Nov 30 05:33:32 2020
+++ src/sys/arch/x86/x86/vm_machdep.c Sun Mar 28 10:29:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.44 2020/11/30 05:33:32 msaitoh Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.45 2021/03/28 10:29:05 skrll Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.44 2020/11/30 05:33:32 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.45 2021/03/28 10:29:05 skrll Exp $");
#include "opt_mtrr.h"
@@ -304,8 +304,8 @@ vmapbuf(struct buf *bp, vsize_t len)
taddr = uvm_km_alloc(phys_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
bp->b_data = (void *)(taddr + off);
/*
- * The region is locked, so we expect that pmap_pte() will return
- * non-NULL.
+ * The region is locked, so we expect that pmap_extract() will return
+ * true.
* XXX: unwise to expect this in a multithreaded environment.
* anything can happen to a pmap between the time we lock a
* region, release the pmap lock, and then relock it for
