The branch stable/15 has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ab45c859374d750a6b68292cf40889b8ca5db04a
commit ab45c859374d750a6b68292cf40889b8ca5db04a
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2025-09-04 20:23:00 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2025-09-15 14:51:26 +0000
LinuxKPI: correct the LINUXKPI_VERSION check for abs_diff()
The code introduced abs_diff() as migrated from drm to standard
linux headers. The LINUXKPI_VERSION check did not allow this to
be visible by default in-tree. Make sure the v6.6 check is optional.
drm-kmod always defines LINUXKPI_VERSION so this should be fine.
Sponsored by: The FreeBSD Foundation (initially)
Fixes: afc450fac9f04
Reviewed by: dumbbell
Differential Revision: https://reviews.freebsd.org/D52071
(cherry picked from commit 736b16e88d2384f9dd0ec11c0492e825b8d42193)
---
sys/compat/linuxkpi/common/include/linux/math.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/math.h
b/sys/compat/linuxkpi/common/include/linux/math.h
index 5a348a57747b..1d50e011f66d 100644
--- a/sys/compat/linuxkpi/common/include/linux/math.h
+++ b/sys/compat/linuxkpi/common/include/linux/math.h
@@ -56,7 +56,7 @@
__ret; \
})
-#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60600
+#if !defined(LINUXKPI_VERSION) || (LINUXKPI_VERSION >= 60600)
#define abs_diff(x, y) ({ \
__typeof(x) _x = (x); \
__typeof(y) _y = (y); \
