From nobody Mon Mar 07 15:47:48 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9379E19F4884; Mon, 7 Mar 2022 15:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KC2sc2gtLz3tT2; Mon, 7 Mar 2022 15:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgDwFQ6hJrE8V38xujP/NzPM70Ntibe5KN7rw8NbrT4=; b=iWY16LY2o2gH+C85YaQYkv03Av7+WX6EQd1aUU7SQ+Izo8ZXUaBXYGt2jXb66dIjEhPvNK MLUgj+ROx4CPOv7y92PFIBqzIJLVXb7iZrBYpwWvK6gdhxoV8EueyQ4MYqRy0C3v3cP5MT N1/liqhicT61YLyXQ1LaRv8Z0tXfdSiDVorgUBj9DAb/vttWpUhssVUFeDG2ZHUEb2A9Qt E1ta3iXRXZqGftqmMzzw847Tsrmn2sqjO8QpJObJS9rynCRnXOyUoVuHZOtPliN5tQpYmj EooXkt9B2hRuAZsM5NPLiZsJ+G3BdL9WbuPH72FuoZIfhgl/GxDMjqoxxczJVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E0EB2EAD; Mon, 7 Mar 2022 15:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227FlmiC049579; Mon, 7 Mar 2022 15:47:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227Flm0v049578; Mon, 7 Mar 2022 15:47:48 GMT (envelope-from git) Date: Mon, 7 Mar 2022 15:47:48 GMT Message-Id: <202203071547.227Flm0v049578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 080b4e8a0cfc - main - kcov: use __func__ in KASSERT instead of old function name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 080b4e8a0cfce3579a660669967d200064822ca1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgDwFQ6hJrE8V38xujP/NzPM70Ntibe5KN7rw8NbrT4=; b=esP3HbnQo2/dUKhVX9HyqokjTnmdACVM19J0LgzjyGonMx909AHzRyTrLQ3eZ1SR+uIr5x sMATN/RXGq09SJ958ManqV3lSSS5tlg7f9d+1zDae/rDnAilIvfL+RKXoz2ULeklf/Fj94 BkjqYNhA7CdjsbTJgWJQ4M5RLX/aH1Bfv2Y+N+fEjve5LiI3BZK1hfcT2V9fVqJQs7Oafk x+lYEX7TZSgQTBOE3vw/ihPN7E8oiySQSnj+iSO2F/nv9YxFYO6E5rqRe4zzqKZ1ISlNcJ xmpktDD1VmpHs1Tp9iJEa4zdfqOmZMzr3U1SRYm9PKLmKLkGiNoDueoVZNTwaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646668068; a=rsa-sha256; cv=none; b=v3pdgEaLGFnKxc7CwFZ1g2SeEZx1+VB86O29YJ3sXqWxrx83jQCsWh7+1PZn2hWS0E2r3l iCkAzcFFQLLMOJRXS6zyifhIeS+dhu/rsdrNWhrzoB5ckBz04LFByHTcswwZpYg2SsZKp7 6e7OxF0nVeJrEiRreLdNBWh+UNF/iO6uM11r6Lj8slTpyT6DobuRXTy7ly31SbdilBCXFo AS0h3fvHa4Q4mwAbA5wGaB3opKKegBAIT4NbPXuMgxpmKRR9iCYT+sdCJOFmhas42HHdYk h9qv4c0vn7RkfOoubOGTdhjaantGCn7A7b1Y0IX1ETqzX4Ow/IimwtadgDYe6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=080b4e8a0cfce3579a660669967d200064822ca1 commit 080b4e8a0cfce3579a660669967d200064822ca1 Author: Ed Maste AuthorDate: 2022-03-07 14:48:38 +0000 Commit: Ed Maste CommitDate: 2022-03-07 15:47:27 +0000 kcov: use __func__ in KASSERT instead of old function name MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/kern/kern_kcov.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_kcov.c b/sys/kern/kern_kcov.c index 1f8b62df7b4b..287071e8ac3a 100644 --- a/sys/kern/kern_kcov.c +++ b/sys/kern/kern_kcov.c @@ -210,8 +210,7 @@ trace_pc(uintptr_t ret) if (info->mode != KCOV_MODE_TRACE_PC) return; - KASSERT(info->kvaddr != 0, - ("__sanitizer_cov_trace_pc: NULL buf while running")); + KASSERT(info->kvaddr != 0, ("%s: NULL buf while running", __func__)); buf = (uint64_t *)info->kvaddr; @@ -242,8 +241,7 @@ trace_cmp(uint64_t type, uint64_t arg1, uint64_t arg2, uint64_t ret) if (info->mode != KCOV_MODE_TRACE_CMP) return (false); - KASSERT(info->kvaddr != 0, - ("__sanitizer_cov_trace_pc: NULL buf while running")); + KASSERT(info->kvaddr != 0, ("%s: NULL buf while running", __func__)); buf = (uint64_t *)info->kvaddr;