Module Name: src
Committed By: riastradh
Date: Mon Jul 15 12:51:50 UTC 2024
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
uvm_map.c: Fix kassertmsg/printf newline mismatch in PR 51254 note.
To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/sys/uvm/uvm_map.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_map.c
diff -u src/sys/uvm/uvm_map.c:1.411 src/sys/uvm/uvm_map.c:1.412
--- src/sys/uvm/uvm_map.c:1.411 Fri Feb 9 22:08:38 2024
+++ src/sys/uvm/uvm_map.c Mon Jul 15 12:51:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.411 2024/02/09 22:08:38 andvar Exp $ */
+/* $NetBSD: uvm_map.c,v 1.412 2024/07/15 12:51:50 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.411 2024/02/09 22:08:38 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.412 2024/07/15 12:51:50 riastradh Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -1786,16 +1786,22 @@ uvm_findspace_invariants(struct vm_map *
flags, entry, line);
#ifndef __sh3__ /* XXXRO: kern/51254 */
KASSERTMSG(!topdown || hint <= orig_hint,
-#else
- if (__predict_false(!(!topdown || hint <= orig_hint)))
- printf(
-#endif
"map=%p hint=%#"PRIxVADDR" orig_hint=%#"PRIxVADDR
" length=%#"PRIxVSIZE" uobj=%p uoffset=%#llx align=%"PRIxVSIZE
" flags=%#x entry=%p (uvm_map_findspace line %d)",
map, hint, orig_hint,
length, uobj, (unsigned long long)uoffset, align,
flags, entry, line);
+#else
+ if (__predict_false(!(!topdown || hint <= orig_hint)))
+ printf("map=%p hint=%#"PRIxVADDR" orig_hint=%#"PRIxVADDR
+ " length=%#"PRIxVSIZE" uobj=%p"
+ " uoffset=%#llx align=%"PRIxVSIZE
+ " flags=%#x entry=%p (uvm_map_findspace line %d)\n",
+ map, hint, orig_hint,
+ length, uobj, (unsigned long long)uoffset, align,
+ flags, entry, line);
+#endif
}
/*
