Module Name: src
Committed By: kre
Date: Mon Oct 30 00:55:42 UTC 2017
Modified Files:
src/sys/uvm/pmap: pmap.c
Log Message:
Remove a stray '"' (obvious typo) and add a couple of casts that are
probably needed.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.37 src/sys/uvm/pmap/pmap.c:1.38
--- src/sys/uvm/pmap/pmap.c:1.37 Sat Oct 28 00:37:13 2017
+++ src/sys/uvm/pmap/pmap.c Mon Oct 30 00:55:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.37 2017/10/28 00:37:13 pgoyette Exp $ */
+/* $NetBSD: pmap.c,v 1.38 2017/10/30 00:55:42 kre 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.37 2017/10/28 00:37:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.38 2017/10/30 00:55:42 kre Exp $");
/*
* Manages physical address maps.
@@ -884,8 +884,8 @@ pmap_pte_remove(pmap_t pmap, vaddr_t sva
const bool is_kernel_pmap_p = (pmap == pmap_kernel());
UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmaphist);
- UVMHIST_LOG(pmaphist, "(pmap=%p kernel=%c va=%#jx"..%#jx)",
- pmap, (is_kernel_pmap_p ? 1 : 0), sva, eva);
+ UVMHIST_LOG(pmaphist, "(pmap=%p kernel=%c va=%#jx..%#jx)",
+ (uintmax_t)(uintptr_t)pmap, (is_kernel_pmap_p ? 1 : 0), sva, eva);
UVMHIST_LOG(pmaphist, "ptep=%#jx, flags(npte)=%#jx",
(uintptr_t)ptep, flags, 0, 0);
@@ -1029,7 +1029,8 @@ pmap_pte_protect(pmap_t pmap, vaddr_t sv
UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmaphist);
UVMHIST_LOG(pmaphist, "(pmap=%#jx kernel=%jx va=%#jx..%#jx)",
- pmap, (pmap == pmap_kernel() ? 1 : 0), sva, eva);
+ (uintmax_t)(uintptr_t)pmap, (pmap == pmap_kernel() ? 1 : 0),
+ sva, eva);
UVMHIST_LOG(pmaphist, "ptep=%#jx, flags(npte)=%#jx)",
(uintptr_t)ptep, flags, 0, 0);
