The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d283601b80fe95dddc8b9dce7895c0fb6f19ee6a
commit d283601b80fe95dddc8b9dce7895c0fb6f19ee6a Author: Mateusz Guzik <[email protected]> AuthorDate: 2022-03-03 20:26:59 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2022-03-03 20:26:59 +0000 Revert "Expand __diagused to include the KTR kernel diagnostic option." This reverts commit 55339af296ca2a360a82e46d6699fd1b57ecf815. Induces warnings for kernels built with KTR but without debug. Discussed with: scottl --- sys/sys/systm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index f597ae2a1f03..f2ffa7e6b815 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -554,7 +554,7 @@ void _gone_in_dev(device_t dev, int major, const char *msg); #define gone_in(major, msg) __gone_ok(major, msg) _gone_in(major, msg) #define gone_in_dev(dev, major, msg) __gone_ok(major, msg) _gone_in_dev(dev, major, msg) -#if defined(INVARIANTS) || defined(WITNESS) || defined(KTR) +#if defined(INVARIANTS) || defined(WITNESS) #define __diagused #else #define __diagused __unused
