From nobody Thu Nov 28 16:55:21 2024 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 4Xzj9P6C4gz5dy7p; Thu, 28 Nov 2024 16:55:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xzj9P5YlQz4V69; Thu, 28 Nov 2024 16:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732812921; 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=DiXuRNXExSk19WLyDqMJRoH1drY4mTCIN0oMG2kJdmM=; b=DgDwiKOaTIQtWYVWTrbM9SudPihRLKYfGVjIpEQlFjGn2oSTHLHZ2qbTbl5c4H2Bj4Xscd xFLKtMxD6e1R6dg92FsnDBISgd4G+l6bvBuTZOBq11jhuLrgBOGt5rf+VPBET+ocGtO+dJ cVAr/Du00cfzT+ghUmafrZWGWVm793MfEid8YDf5dBueYXcYfy7hD7FTRs9zLMGuNdqSWj LfxJ5YY9gOArRPTQ11kkfQD3xrheRnl2DtCH5MnEFmmRTH2H2AlGMOJD/WHMOI11VLc6jO To3KrlBUYazvCtKeZ9+vhYL0dLm+bItkwVwPaKCY+uZAO8kooaD0cAelVHb0lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732812921; 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=DiXuRNXExSk19WLyDqMJRoH1drY4mTCIN0oMG2kJdmM=; b=fEBWIcQcnJd7HJNYSxn8InkW3U0wZECHBKV5C7A7dXIz+W87C18tAx+MgaFqajmBMhsEw/ NwR4/HfFDKjDnuA5oY/MNdcp+epdSfiKCLhsOuau69GToyuw8H3mPxmAUUx41lyWtFre7H CSyg3eInJQwf4XV6Ty+/tUd4MSFfib/az6941z+oyKJ5UuSE9xX6tWPpGSUIR/a+UQqy1d eFoHAsYSsCPLUvumOSFvOtSJ5JPzpsTPYB7G3R+W6zljX7TMdDE0msOL/yu7eg0RZwZC9z RJlDkV4yQYoMQK12rctKyEb62s3uN5jpK7u2/b1wttsSU7ZJoa5FG7JFYCAOcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732812921; a=rsa-sha256; cv=none; b=ZUPi30z5yJwJAC7yXFMzq9pN+xczUxTa3GkCxp5yuS8gJ/54n+f6/2Vg9z5tHKdsjhIPII HBxg+Y4yu5+Z69zxEJ0kpp/1OY1ZOZM3UVqfWcd8BoleNgnLn9QShUC/16g+ngUHkzZDVE p1nbIJmYuzrihKp0nkI42iWLAcSF7IjrwaxtALqYzx6k33QLkU4GBbO5jEd/Cfx5jQZFQW Upil8BwARU5kOs8KfjboSm5L8VoPkXU/iiEaWCGiErkY0vDWXAESAUteGj/t0WpUOqwy/D Z3STSCLbVR+dGwkWP0+5RaxNdcUsHxIS7BLCRtkNLU+rqtNEA10h9PvnW2s3oA== 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 4Xzj9P52PNznWK; Thu, 28 Nov 2024 16:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ASGtLvK094413; Thu, 28 Nov 2024 16:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ASGtLrS094410; Thu, 28 Nov 2024 16:55:21 GMT (envelope-from git) Date: Thu, 28 Nov 2024 16:55:21 GMT Message-Id: <202411281655.4ASGtLrS094410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: de852d78ff58 - main - hwpmc: Restore line lost in previous commit 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de852d78ff58643d91bb672571757ef73ca74c39 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=de852d78ff58643d91bb672571757ef73ca74c39 commit de852d78ff58643d91bb672571757ef73ca74c39 Author: Alexander Motin AuthorDate: 2024-11-28 16:53:24 +0000 Commit: Alexander Motin CommitDate: 2024-11-28 16:53:24 +0000 hwpmc: Restore line lost in previous commit MFC after: 3 days --- sys/dev/hwpmc/hwpmc_logging.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c index b472bf856b92..8fd7ef06a977 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -139,6 +139,7 @@ static struct mtx pmc_kthread_mtx; /* sleep lock */ ph = (struct pmclog_header *)_le; \ ph->pl_header =_PMCLOG_TO_HEADER(TYPE,_len); \ ph->pl_tsc = tsc; \ + _le += sizeof(*ph) / 4 /* skip over timestamp */ #define PMCLOG_RESERVE_SAFE(P, T, L, TSC) \ _PMCLOG_RESERVE_SAFE(P, T, L, return, TSC)