From nobody Tue May 03 18:21:27 2022 X-Original-To: dev-commits-src-all@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 05E0D1AB7370; Tue, 3 May 2022 18:21:28 +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 4Kt7Zb4CqBz3hpM; Tue, 3 May 2022 18:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651602087; 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=OzU+CqWHbslP6cDfP5AvvUBFE1MlCvjiyhuDuPoI9W8=; b=N1uZAzhLwRcxheKGMCYXaXN3Rz6PoQ8MD+vCQyNYb2MUAjHwiSzM8csGD7oyRIeZ3rxyl/ bKeyN0Ewsr2dYFiwFoeRjXmJhuDA/8lfGVXOtRRhi5zpZRPQD/2ceJSh5LRHXU150kZbmi y8QOdQ5GVEBn8g276PNxqY5vcFYmg0msdV0mTfiCG34zMZxVBaDtS7r3FvPXU1+q6+fJMj jBu+gUOp/TUbi8+kxkJ5qHJaP9beHTF1kVbIM615YdB/uLbwO1wTt23ZhSN6dtOloff+wN cJlobaOP3zxfyk4i4JhcbFfg1//rIfu5jB9P+UmgFtH+ZH0oRNLdZh5oVsujrw== 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 6C900233C6; Tue, 3 May 2022 18:21:27 +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 243ILRT4025792; Tue, 3 May 2022 18:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243ILRt0025791; Tue, 3 May 2022 18:21:27 GMT (envelope-from git) Date: Tue, 3 May 2022 18:21:27 GMT Message-Id: <202205031821.243ILRt0025791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6841bc7b8c02 - stable/13 - kcov: use __func__ in KASSERT instead of old function name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6841bc7b8c02d581a96ef2f591bfc6f01f96e9bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651602087; 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=OzU+CqWHbslP6cDfP5AvvUBFE1MlCvjiyhuDuPoI9W8=; b=gfq2CxVDuPYaLsQC0wP9l3ZdMGF0QzMcKo7tsOnl5FTlITrGjRItr3IuqF8B9ZdiPLtAmz VO/JZXftC/zPX3onrhNtpjN43tVL3hyfgkpQBOppS/I96QVOtiPko7aa12NDhgTNBGz28b NrtKgK/agRM19WxXizopcurlJCf5wQGWY0JQEwb2QKMsMo/eYIgU5CkyA/owH1nxa0Xjrm avJfhK6VdocMZH+RCysU/m578tT0jk9FttpplDq8cnNRc+NxbZEjKPjNnt8zv92BVmKzhE RU3BG+O8LTGwqo7qmpMs7bwqFGsv84i5o3cPw4QTY1Q72ro6yn0RFH7tXYILiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651602087; a=rsa-sha256; cv=none; b=RJ/G3uCa/6n6c2kNGGy+romDzP5cmuxZvvFlNM5WDG4Pp5plXYT9og/KRc9c+NzMCE7blP riV49WCjjvq3GQ2MTlWKDDuxV2glcG+gAC4ptgyu6hiOiYSi22XrtyB7bHpkXrjux6k+NX kvV6k7b+Aic4ONsobiYmm8GfqtGaZsNqNaPWgN7RQAmUNl5lM16E2PyYH7RKGpWuODNYL6 fFyRGlVRCdS+oYJmPsWEN2p6ghEF43ucDM4YknukWF6IRu0pHRv1XCcfTKcrhOeDoBPppp 1++mOpa7ADgXCb/H9/ypUktNIKs783CKYyXYfcIU7E+6xrIiPPBmGXaaWJBanQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6841bc7b8c02d581a96ef2f591bfc6f01f96e9bb commit 6841bc7b8c02d581a96ef2f591bfc6f01f96e9bb Author: Ed Maste AuthorDate: 2022-03-07 14:48:38 +0000 Commit: Ed Maste CommitDate: 2022-05-03 18:20:44 +0000 kcov: use __func__ in KASSERT instead of old function name MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 080b4e8a0cfce3579a660669967d200064822ca1) --- 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 23e0da4cdb79..cd1547f2ce43 100644 --- a/sys/kern/kern_kcov.c +++ b/sys/kern/kern_kcov.c @@ -209,8 +209,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; @@ -241,8 +240,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;