Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/uvm Avoid passing file paths in panic strings, this resu...



details:   https://anonhg.NetBSD.org/src/rev/06a6349e7101
branches:  trunk
changeset: 933747:06a6349e7101
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat May 30 08:50:31 2020 +0000

description:
Avoid passing file paths in panic strings, this results in extra long
output that is annoying and that syzbot classifies as independent reports
due to the instances having different build paths.

diffstat:

 sys/uvm/uvm_map.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r ef7415c949ac -r 06a6349e7101 sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Sat May 30 08:41:22 2020 +0000
+++ b/sys/uvm/uvm_map.c Sat May 30 08:50:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.383 2020/05/09 15:13:19 thorpej Exp $    */
+/*     $NetBSD: uvm_map.c,v 1.384 2020/05/30 08:50:31 maxv 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.383 2020/05/09 15:13:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.384 2020/05/30 08:50:31 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pax.h"
@@ -296,9 +296,8 @@
 static void    uvm_mapent_copy(struct vm_map_entry *, struct vm_map_entry *);
 static void    uvm_mapent_free(struct vm_map_entry *);
 #if defined(DEBUG)
-static void    _uvm_mapent_check(const struct vm_map_entry *, const char *,
-                   int);
-#define        uvm_mapent_check(map)   _uvm_mapent_check(map, __FILE__, __LINE__)
+static void    _uvm_mapent_check(const struct vm_map_entry *, int);
+#define        uvm_mapent_check(map)   _uvm_mapent_check(map, __LINE__)
 #else /* defined(DEBUG) */
 #define        uvm_mapent_check(e)     /* nothing */
 #endif /* defined(DEBUG) */
@@ -827,7 +826,7 @@
 
 #if defined(DEBUG)
 static void
-_uvm_mapent_check(const struct vm_map_entry *entry, const char *file, int line)
+_uvm_mapent_check(const struct vm_map_entry *entry, int line)
 {
 
        if (entry->start >= entry->end) {
@@ -856,7 +855,7 @@
        return;
 
 bad:
-       panic("%s: bad entry %p (%s:%d)", __func__, entry, file, line);
+       panic("%s: bad entry %p, line %d", __func__, entry, line);
 }
 #endif /* defined(DEBUG) */
 



Home | Main Index | Thread Index | Old Index