From nobody Mon Jul 15 12:38:28 2024 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 4WN1vm56BMz5Qrny; Mon, 15 Jul 2024 12:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1vm3MNTz4Hq9; Mon, 15 Jul 2024 12:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047108; 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=vo+JSC1qJoNIuX8hZtG7grfiDY3l/V6Q3Psmb5PQNQE=; b=MbrEIO/Xzunjab6M+BHW6Wi2+nxrmFCQYu5arR42KvEaB/a9XFJR/pVSAwWFUFuoST5TeQ kwAiT/o8wXVH235uAjZib4ZSf8nutBCxAgDp3sSW0Ye9zrrpbzH4mvxIrQRaVzOX6hkakC pwBJgM4DucPx0avL1KfXdA512EF/Z4gbakn51Ut6AU/5Awj8mJXbe6HKBWe6jp/qvYRfOA eU5ca3hYexB44NFQs0qrLCRWxGg2u5O06gROHH41jb78Q8eNN5QDjpJZQtngo+fZP+BFfL xLCaN0F7BBE/hCpU8W2xqhQVi4wQ5z92cMwNLUXWAltJ/0j48SnIFnZSjI/7ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047108; a=rsa-sha256; cv=none; b=xhK7UJdI4dgJk+StRQUj7H0qOwBaxPzQ8vbQ+ornz2ve4o89bhpAewrgaB23yIaKaILZmP ynrk+QJTl4sX9vZXozWV9rglXYi5os92cn3LeLj6kZQU59bLDq8vk4m4eebIvjwQbfQp2B cl5DXPpR4EGfOPjLIsND/Py7DywSig5+Rws+k8Q7LPUKdGsY0I3NnqfVKr0Yp4xVTNHv0X MHaf484PDWBZczR8VrQyS/F+T6fNGOu+9vqI4SmFRh6MNOaI+yUtRfL8Qda1pyBHqS+7RX ZPttVSn1L+bFaFjvXn2SSsoytoVtjcWI7JhOyrcOvSbC59JzMgi2eqT8GfKoIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047108; 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=vo+JSC1qJoNIuX8hZtG7grfiDY3l/V6Q3Psmb5PQNQE=; b=gC/ofO06bNMyGgF6rc6Tktd/ahkSg87mqJUyoqNlpTRJGBVJmkNfQZdOTDa3ipvPmkCkdh DSjsybwM4MgIc34q2TpLfiD2e4l8U/jzdt26wTsymhL7Gw6RcM1zm0qzSqsb+O2u9xd0cw WED6icxC1yVmYi2xadUp9q/etO14vMkXCcPPK4wVkn3aCfCf8PDEIxIErFb+VfLFlIAQmB EP9DLjWL0x029hkbgRYf67I9q+7HG3a8HCP8NOcbafD+//fLPHnzjMps4HH2/Vm0ZGQHMu W30C3k1J3mBILhFPNlTPgSf9hN25n2EgSG/KqMixhBKygNBizbfSS73Rfxz5Zg== 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 4WN1vm2zsgzt5n; Mon, 15 Jul 2024 12:38: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 46FCcSAg061504; Mon, 15 Jul 2024 12:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcSZW061501; Mon, 15 Jul 2024 12:38:28 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:28 GMT Message-Id: <202407151238.46FCcSZW061501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: dfd26e29dd43 - stable/14 - dev/hwpmc: Fix the dmc620 MD4 macro 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dfd26e29dd43e4370ba31159c57fa474ef6e995b Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd26e29dd43e4370ba31159c57fa474ef6e995b commit dfd26e29dd43e4370ba31159c57fa474ef6e995b Author: Andrew Turner AuthorDate: 2024-05-22 08:19:49 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:27:45 +0000 dev/hwpmc: Fix the dmc620 MD4 macro Add braces to the dmc620 MD4 macro to fix the GCC build. Reviewed by: brooks, imp, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45266 (cherry picked from commit 131c1718c6331e87f139b42b4ad0e57b6a71ea44) --- sys/dev/hwpmc/pmu_dmc620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/pmu_dmc620.c b/sys/dev/hwpmc/pmu_dmc620.c index 42e5dfdbf154..c33e5264f7de 100644 --- a/sys/dev/hwpmc/pmu_dmc620.c +++ b/sys/dev/hwpmc/pmu_dmc620.c @@ -68,7 +68,7 @@ struct pmu_dmc620_softc { #define RD4(sc, r) bus_read_4((sc)->sc_res[0], (r)) #define WR4(sc, r, v) bus_write_4((sc)->sc_res[0], (r), (v)) -#define MD4(sc, r, c, s) WR4((sc), (r), RD4((sc), (r)) & ~(c) | (s)) +#define MD4(sc, r, c, s) WR4((sc), (r), (RD4((sc), (r)) & ~(c)) | (s)) #define CD2MD4(sc, u, r, c, s) MD4((sc), DMC620_CLKDIV2_REG((u), (r)), (c), (s)) #define CMD4(sc, u, r, c, s) MD4((sc), DMC620_CLK_REG((u), (r)), (c), (s))