From nobody Wed May 22 08:32:06 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 4Vkl0Q4HKcz5LDSc; Wed, 22 May 2024 08:32:06 +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 4Vkl0Q2lCsz4jWy; Wed, 22 May 2024 08:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716366726; 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=+3T5T/SgZVshoWTpIJZtltUbZ60NtpDUolDWVUHhY9A=; b=V7WbIpAb8sdxm54sml5F6UkpZqPu9J+F9NnwZatlLhqPKzcla2DypZFBLis2fEXvs2tm3D b8NCO1+0MehEuZDh/M7eg0DMxHTlQiRo0QvL19xzmdXFWjy2kSJdKTf+IIe5WshSINEuzr KzYTZUF7N0cvXefMO3L4jpI2mUMrTQo+9iAHshjFAiMw2Nv/6dBf8mjXMPkfWe7u0qlK5g ljLubknE+0DG4diSPGY2MMbdh+QEZyaIn+NtGKuHVeP2agAUpRReKSj+KUa2V+ZPG9K/QD HXi0+RPPELNBrolJjyUJdEtOWn1Sa+XiLGjMKSuGazjwri7vlqsoiAsmJp9KRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716366726; a=rsa-sha256; cv=none; b=m7WtnRaFd2NKeaPQ5nADBDcBYB3osQLNi5VsxzeHJ6aMzdMncMk0Ycsr4sDzEFHsDwGIYC Rbk28Weo0Uqw7JS+kiFb9xrWMJFWzjyxLp+633hCjIVMkp04Log0S2e4dGb+SnAwy8jTUt RMUq2DcUJC3a0I8q7Dirik5eTL98XIBP6XJQJUQaUDbj57VKajbyVAJhKdkJgiqNwel/CW Q/IgYoK07C6NhfIbOyael60j2HvEmYSnN5S8r9MID3I5IGlTmYglJWW19j98SFeQEz0i0Q QmLFKQlUVp9G5KFjKJfxRf44nBdXp0dgYlXRcCHiyOIkaBPZ803R5rQaALVMOA== 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=1716366726; 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=+3T5T/SgZVshoWTpIJZtltUbZ60NtpDUolDWVUHhY9A=; b=imGW+zeVnUXWBViYtDVAO3atp5tHYOcHpE+T9u/Bnb06dHyXIqlDNXNG0keBUYBooK1mks Uyh3HwvMNfjM+6PEvx7HHQKxMHvVS5olqshpbuz6IavAXMThT3msUOiLkpg3/1v2AnVA5A ApFjCD/IvSbBlWpemhfizmbDezcS7Q57F0igUMyAlGqDudguvEyV6i9USxXRzBC4oGG8/4 5lnqVvZ48rUL/bT7ElBNF7Xiq2eZNvOGzej+DUkDWP4vRcHLSzHZcPEJypbWolWb1ykLR/ Ngyqkk44jDubdmSfqvHODvjNpVP6ChlbKbwYLLwflizjHfSfNiI26LuDfzTe7g== 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 4Vkl0Q2MP1zyG7; Wed, 22 May 2024 08:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44M8W6fT009115; Wed, 22 May 2024 08:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44M8W6G5009112; Wed, 22 May 2024 08:32:06 GMT (envelope-from git) Date: Wed, 22 May 2024 08:32:06 GMT Message-Id: <202405220832.44M8W6G5009112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 131c1718c633 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 131c1718c6331e87f139b42b4ad0e57b6a71ea44 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=131c1718c6331e87f139b42b4ad0e57b6a71ea44 commit 131c1718c6331e87f139b42b4ad0e57b6a71ea44 Author: Andrew Turner AuthorDate: 2024-05-22 08:19:49 +0000 Commit: Andrew Turner CommitDate: 2024-05-22 08:19:49 +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 --- 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))