From nobody Wed Mar 2 22:58:43 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 C013E19F098B; Wed, 2 Mar 2022 22:58:43 +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 4K88g74tJKz3qJx; Wed, 2 Mar 2022 22:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646261923; 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=YtRxnezuA0mMXBJiJ1q7AVRBVarZ8jZVlACZFq4aOLE=; b=NRdtKy7wp0ByFABmDKfiSaXczj2IAYXz1RMPoZXoJjbXxTAdlpHr/chXPTo3sxzttTT1zB IqLIkjHGeUKI+UF7oppVe9CZKfUP9V/TChwoi89CeHVd2sd627wZ1UCS3ziLlGODUk+D3b /HLc1muLWsg/VjKlZkDjEAgZPf0iiZMgV/paFMtQpShw9cm9gzHn6c1F3JjQZ4g3Xlpqz9 OUOYbOn8n5M3nkhCPGZ2P0eRPDMnNPzwQ6x0pNR5Ip9m1JG/zqhKQK+QYD/wnZIm5e2pFF l9Nb5UBUgoIjbP4BfR0T2iw71dZvY9AE+Yzno7nZDFmhDQgtgd24diHRPNln0A== 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 839604798; Wed, 2 Mar 2022 22:58:43 +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 222Mwh8p047126; Wed, 2 Mar 2022 22:58:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222Mwhxg047125; Wed, 2 Mar 2022 22:58:43 GMT (envelope-from git) Date: Wed, 2 Mar 2022 22:58:43 GMT Message-Id: <202203022258.222Mwhxg047125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: edafb5b859d4 - main - hwpmc_arm64_md.c: Correct architecture name in assertions. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edafb5b859d44cdd2642fc6104b2e7a0131d836f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646261923; 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=YtRxnezuA0mMXBJiJ1q7AVRBVarZ8jZVlACZFq4aOLE=; b=ESesGSZpjyo7u0sQOCHy0hl8JS6Lb9DLC0RjGGTIXrRr7qAvfEogsjhEN4SStumhbB71Wj 9dwbnOTaxoi3Vir9p0eIcs1Eag94IamEbo01oBJdlIDckLAWdTNwtNz8ISVjWV9O6T3zo0 R/OvT587iyha2jxqojTwWfChwRIGXFaOff9kUx7rDid+uRlF7YH7jZnNdvnvzCmuszR6P5 ZsHQiwKVtOxlYnuYQEmBBfhz/vbNs7qN46cv4DIRAfh3Lrvh7CWgzYTAdDeQFcOT2413HW BPQV//pn4dHWAVbqxsR9IPtPoxpE5EZ+D+lgg9NiR4d6nBoyuuAMk669iJ7oYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646261923; a=rsa-sha256; cv=none; b=JPm2OX3+nZio4e/LrzIeqHViSS1D4uKsOmvOctx3UKaN25+vIhhlsWC5J9I+ofDfKHnnjh L7VOBPEfJQEgT0jy/Pj6zMzVX9VuZSlbla2U2dSt3hR09BajYh7ijh+qsaU8MPsH0TH1E1 vb7uFt8VkyaiTH9K4yddX8aqw1KS77nfWsfSGU3N/tZvseph6JkR/i04EhYqZspcu8yF6q YIsUsqyWWcDBFhVqF9dMmrhjIcSmKqXeH2v70A52KPS+Vl9v0m+PQLQTv9IddnYHU4vAcK 3ttWOSvTa6p3BXYbCbS5CGSKAHP/EtjKs70FILFCKsTjEZLTTWr+YvpEpauHvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=edafb5b859d44cdd2642fc6104b2e7a0131d836f commit edafb5b859d44cdd2642fc6104b2e7a0131d836f Author: Brett Gutstein AuthorDate: 2022-03-02 22:57:40 +0000 Commit: John Baldwin CommitDate: 2022-03-02 22:57:40 +0000 hwpmc_arm64_md.c: Correct architecture name in assertions. Obtained from: CheriBSD --- sys/dev/hwpmc/hwpmc_arm64_md.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64_md.c b/sys/dev/hwpmc/hwpmc_arm64_md.c index 9037c4636b15..e343d81d5172 100644 --- a/sys/dev/hwpmc/hwpmc_arm64_md.c +++ b/sys/dev/hwpmc/hwpmc_arm64_md.c @@ -66,7 +66,7 @@ pmc_save_kernel_callchain(uintptr_t *cc, int maxsamples, struct thread *td; int count; - KASSERT(TRAPF_USERMODE(tf) == 0,("[arm,%d] not a kernel backtrace", + KASSERT(TRAPF_USERMODE(tf) == 0,("[arm64,%d] not a kernel backtrace", __LINE__)); td = curthread; @@ -115,7 +115,7 @@ pmc_save_user_callchain(uintptr_t *cc, int maxsamples, struct thread *td; int count; - KASSERT(TRAPF_USERMODE(tf), ("[x86,%d] Not a user trap frame tf=%p", + KASSERT(TRAPF_USERMODE(tf), ("[arm64,%d] Not a user trap frame tf=%p", __LINE__, (void *) tf)); td = curthread;