Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Sep 2025 23:29:00 GMT
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 736b16e88d23 - main - LinuxKPI: correct the LINUXKPI_VERSION check for abs_diff()
Message-ID:  <202509052329.585NT0AC029211@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=736b16e88d2384f9dd0ec11c0492e825b8d42193

commit 736b16e88d2384f9dd0ec11c0492e825b8d42193
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-09-04 20:23:00 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-09-05 23:24:14 +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
    MFC after:      3 days
    Reviewed by:    dumbbell
    Differential Revision:  https://reviews.freebsd.org/D52071
---
 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);		\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202509052329.585NT0AC029211>