From nobody Sun Dec 1 00:56:28 2024 X-Original-To: dev-commits-src-branches@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 4Y17lc6MGbz5fwvm; Sun, 01 Dec 2024 00:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y17lc5cjlz4xQr; Sun, 1 Dec 2024 00:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733014588; 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=+QgvMqXrWu4J9WoOKs0tBAUOkw0Xgdw3GA+zW+ZXJ2I=; b=ELkBPjplOr2wVI+Y1mP4eIlzEDLqXnIyf9EuGJO47e03a/t8A9ElvhDxd2QfrOxsUOKt1O GVJIr3yB2deeig7TXb2sCJ1MHfYfUeydNcXiE2beu2A2V+tecea79MRm6q1z0Yoc+46AZW Z2JOObr0ThhhOqzpIyZ3o5/yw73f9Q8hq2mqVZZumfuM8m6AZlKIO9b5gOzf2ZwjMWnMwq BCZFH80t7DZK9HRgSADcp5uyE4Duwv5KR73HK5ti0/wbmznygjqSEROfZlCi4UKQlB7MH9 L1zVhtX40ix9qqsmYP6kjg0ewYFwOa7FZlGU3b97D3zXNpyAZaCt0m3RmQOWXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733014588; 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=+QgvMqXrWu4J9WoOKs0tBAUOkw0Xgdw3GA+zW+ZXJ2I=; b=adB+bVT6LtpYIrCY4OItWLB83yJAMEwQUCUZhuOkBMeBaBs8WhVv+8Fq+BCpOE972iBloT xVvO/B0/5WWpcc/99RJ3oV1Vfm47vc7OkB1blQWhR85Unf4XofE5PrhJMQ10HCLeO1Di4l 7oJpcA7Gs+ODF2o3yHdn0y3duXxvWGEsiKJIIRqWRasg1iiIhzXkZCXWGyR20I6RUnkvCH wSRn3Vi9l6Qu3j1wTn9Vyi6SyHhMKgptcmIk/RBXCaAfoZRZT0aB9veoBTl8d9j/UicMJR eFP8jWtgsFiQ5WaD1csB7fdxS+4aQdHQiKyhoSTq6jn7hKssHIKp8SITKCdJ9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733014588; a=rsa-sha256; cv=none; b=ctr8p236aQ/aoAqRClcrmkGAbqAVRU2SyNTAoIK9wuq/B4MmTm/pA6Eq1X+4FmE+Y8l4v+ aN/Wclb+DokgXONnFqd8Z3HT03yunfjdmSYEqnODWIqUHZOEkem4phmz5jY2G8m+s2ODC0 lTcmqs5QwvFxlNATfxi+gBzZWuk+AIDzkpAjP9QM9IWNCuh0hBYCsIvrcHTkfbJjBqJRP7 dG/PWa3X6iNZk1cVWWQ6MAA1vhtlMUI4SggtvB+/AKHZcIqtqDRIdOLmdtxmYfJBmdTav/ 2e3aJuOFTbUvHMAj7F6YzHDYx1t+nb8k6zgjX3MbcNeqr0X469L7Bq9k3M1Oiw== 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 4Y17lc5DRYzX84; Sun, 1 Dec 2024 00:56:28 +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 4B10uSP5046799; Sun, 1 Dec 2024 00:56:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B10uSJH046796; Sun, 1 Dec 2024 00:56:28 GMT (envelope-from git) Date: Sun, 1 Dec 2024 00:56:28 GMT Message-Id: <202412010056.4B10uSJH046796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 7589f9bb7555 - stable/14 - hwpmc: Restore line lost in previous commit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7589f9bb7555c0f84eed9df6f1964082e6ff2698 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=7589f9bb7555c0f84eed9df6f1964082e6ff2698 commit 7589f9bb7555c0f84eed9df6f1964082e6ff2698 Author: Alexander Motin AuthorDate: 2024-11-28 16:53:24 +0000 Commit: Alexander Motin CommitDate: 2024-12-01 00:56:10 +0000 hwpmc: Restore line lost in previous commit MFC after: 3 days (cherry picked from commit de852d78ff58643d91bb672571757ef73ca74c39) --- 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 8b6c2a1feb5b..f63b0e216fae 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -140,6 +140,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)