Module Name: src
Committed By: simonb
Date: Wed Aug 19 07:29:01 UTC 2020
Modified Files:
src/sys/arch/hppa/hppa: pmap.c
src/sys/miscfs/genfs: genfs_io.c
src/sys/uvm: uvm_aobj.c
src/sys/uvm/pmap: pmap.c
Log Message:
Remove trailing \n from UVMHIST_LOG() format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.100 -r1.101 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.149 -r1.150 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.53 -r1.54 src/sys/uvm/pmap/pmap.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/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.113 src/sys/arch/hppa/hppa/pmap.c:1.114
--- src/sys/arch/hppa/hppa/pmap.c:1.113 Mon May 25 21:15:10 2020
+++ src/sys/arch/hppa/hppa/pmap.c Wed Aug 19 07:29:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.113 2020/05/25 21:15:10 ad Exp $ */
+/* $NetBSD: pmap.c,v 1.114 2020/08/19 07:29:00 simonb Exp $ */
/*-
* Copyright (c) 2001, 2002, 2020 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.113 2020/05/25 21:15:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.114 2020/08/19 07:29:00 simonb Exp $");
#include "opt_cputype.h"
@@ -877,7 +877,7 @@ pmap_bootstrap(vaddr_t vstart)
pmap_hpt = addr;
addr += pmap_hptsize;
- UVMHIST_LOG(maphist, "hpt_table %#jx @ %#jx\n",
+ UVMHIST_LOG(maphist, "hpt_table %#jx @ %#jx",
pmap_hptsize, addr, 0, 0);
if ((error = (cpu_hpt_init)(pmap_hpt, pmap_hptsize)) < 0) {
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.100 src/sys/miscfs/genfs/genfs_io.c:1.101
--- src/sys/miscfs/genfs/genfs_io.c:1.100 Fri Aug 14 09:06:14 2020
+++ src/sys/miscfs/genfs/genfs_io.c Wed Aug 19 07:29:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.100 2020/08/14 09:06:14 chs Exp $ */
+/* $NetBSD: genfs_io.c,v 1.101 2020/08/19 07:29:00 simonb Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.100 2020/08/14 09:06:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.101 2020/08/19 07:29:00 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -689,7 +689,7 @@ genfs_getpages_read(struct vnode *vp, st
lbn = offset >> fs_bshift;
error = VOP_BMAP(vp, lbn, &devvp, &blkno, &run);
if (error) {
- UVMHIST_LOG(ubchist, "VOP_BMAP lbn 0x%jx -> %jd\n",
+ UVMHIST_LOG(ubchist, "VOP_BMAP lbn 0x%jx -> %jd",
lbn,error,0,0);
skipbytes += bytes;
bytes = 0;
@@ -1516,7 +1516,7 @@ genfs_do_io(struct vnode *vp, off_t off,
lbn = offset >> fs_bshift;
error = VOP_BMAP(vp, lbn, &devvp, &blkno, &run);
if (error) {
- UVMHIST_LOG(ubchist, "VOP_BMAP lbn 0x%jx -> %jd\n",
+ UVMHIST_LOG(ubchist, "VOP_BMAP lbn 0x%jx -> %jd",
lbn, error, 0, 0);
skipbytes += bytes;
bytes = 0;
Index: src/sys/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.149 src/sys/uvm/uvm_aobj.c:1.150
--- src/sys/uvm/uvm_aobj.c:1.149 Thu Jul 9 05:57:15 2020
+++ src/sys/uvm/uvm_aobj.c Wed Aug 19 07:29:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v 1.149 2020/07/09 05:57:15 skrll Exp $ */
+/* $NetBSD: uvm_aobj.c,v 1.150 2020/08/19 07:29:00 simonb Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.149 2020/07/09 05:57:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.150 2020/08/19 07:29:00 simonb Exp $");
#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
@@ -957,7 +957,7 @@ uao_get(struct uvm_object *uobj, voff_t
/* out of RAM? */
if (ptmp == NULL) {
rw_exit(uobj->vmobjlock);
- UVMHIST_LOG(pdhist, "sleeping, ptmp == NULL\n",0,0,0,0);
+ UVMHIST_LOG(pdhist, "sleeping, ptmp == NULL",0,0,0,0);
uvm_wait("uao_getpage");
rw_enter(uobj->vmobjlock, RW_WRITER);
uvm_page_array_clear(&a);
Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.53 src/sys/uvm/pmap/pmap.c:1.54
--- src/sys/uvm/pmap/pmap.c:1.53 Tue Aug 11 06:09:44 2020
+++ src/sys/uvm/pmap/pmap.c Wed Aug 19 07:29:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.53 2020/08/11 06:09:44 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.54 2020/08/19 07:29:01 simonb Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.53 2020/08/11 06:09:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.54 2020/08/19 07:29:01 simonb Exp $");
/*
* Manages physical address maps.
@@ -405,13 +405,13 @@ pmap_page_syncicache(struct vm_page *pg)
VM_PAGEMD_PVLIST_READLOCK(mdpg);
pmap_pvlist_check(mdpg);
- UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx\n", (uintptr_t)pv,
+ UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx", (uintptr_t)pv,
(uintptr_t)pv->pv_pmap, 0, 0);
if (pv->pv_pmap != NULL) {
for (; pv != NULL; pv = pv->pv_next) {
#ifdef MULTIPROCESSOR
- UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx\n",
+ UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx",
(uintptr_t)pv, (uintptr_t)pv->pv_pmap, 0, 0);
kcpuset_merge(onproc, pv->pv_pmap->pm_onproc);
if (kcpuset_match(onproc, kcpuset_running)) {
