Module Name:    src
Committed By:   maxv
Date:           Fri Jul  3 16:11:11 UTC 2020

Modified Files:
        src/sys/kern: subr_kcov.c

Log Message:
Sync trace-pc and trace-cmp.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/kern/subr_kcov.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/kern/subr_kcov.c
diff -u src/sys/kern/subr_kcov.c:1.15 src/sys/kern/subr_kcov.c:1.16
--- src/sys/kern/subr_kcov.c:1.15	Sat May 16 17:42:06 2020
+++ src/sys/kern/subr_kcov.c	Fri Jul  3 16:11:11 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_kcov.c,v 1.15 2020/05/16 17:42:06 hannken Exp $	*/
+/*	$NetBSD: subr_kcov.c,v 1.16 2020/07/03 16:11:11 maxv Exp $	*/
 
 /*
  * Copyright (c) 2019-2020 The NetBSD Foundation, Inc.
@@ -649,10 +649,16 @@ trace_cmp(uint64_t type, uint64_t arg1, 
 		return;
 	}
 
+	if (__predict_false(kd->silenced)) {
+		/* Silenced. */
+		return;
+	}
+
 	if (kd->mode != KCOV_MODE_TRACE_CMP) {
 		/* CMP tracing mode not enabled */
 		return;
 	}
+	KASSERT(kd->remote == NULL);
 
 	idx = kd->buf[0];
 	if ((idx * 4 + 4) <= kd->bufnent) {

Reply via email to