Module Name: src
Committed By: martin
Date: Thu Feb 27 18:24:44 UTC 2020
Modified Files:
src/sys/uvm [netbsd-9]: uvm_pglist.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #732):
sys/uvm/uvm_pglist.c: revision 1.80
Make this compile again with PGALLOC_VERBOSE.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.72.4.1 src/sys/uvm/uvm_pglist.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/uvm/uvm_pglist.c
diff -u src/sys/uvm/uvm_pglist.c:1.72 src/sys/uvm/uvm_pglist.c:1.72.4.1
--- src/sys/uvm/uvm_pglist.c:1.72 Tue Nov 13 10:31:01 2018
+++ src/sys/uvm/uvm_pglist.c Thu Feb 27 18:24:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pglist.c,v 1.72 2018/11/13 10:31:01 mrg Exp $ */
+/* $NetBSD: uvm_pglist.c,v 1.72.4.1 2020/02/27 18:24:44 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.72 2018/11/13 10:31:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.72.4.1 2020/02/27 18:24:44 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,7 @@ uvm_pglistalloc_c_ps(uvm_physseg_t psi,
paddr_t cidx = 0; /* XXX: GCC */
#endif
#ifdef PGALLOC_VERBOSE
- printf("pgalloc: contig %d pgs from psi %zd\n", num, ps - vm_physmem);
+ printf("pgalloc: contig %d pgs from psi %d\n", num, psi);
#endif
KASSERT(mutex_owned(&uvm_fpageqlock));
@@ -208,8 +208,8 @@ uvm_pglistalloc_c_ps(uvm_physseg_t psi,
* Found a suitable starting page. See if the range is free.
*/
#ifdef PGALLOC_VERBOSE
- printf("%s: ps=%p candidate=%#x end=%#x skip=%#x, align=%#"PRIxPADDR,
- __func__, ps, candidateidx, end, skip, alignment);
+ printf("%s: psi=%d candidate=%#x end=%#x skip=%#x, align=%#"PRIxPADDR,
+ __func__, psi, candidateidx, end, skip, alignment);
#endif
/*
* We start at the end and work backwards since if we find a
