The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=131c1718c6331e87f139b42b4ad0e57b6a71ea44
commit 131c1718c6331e87f139b42b4ad0e57b6a71ea44
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2024-05-22 08:19:49 +0000
Commit: Andrew Turner <and...@freebsd.org>
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))
