From nobody Fri Jan 16 19:40:53 2026 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 4dt9FM3KMtz6NlVk for ; Fri, 16 Jan 2026 19:40:55 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9FL06mHz3xD3 for ; Fri, 16 Jan 2026 19:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592454; 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=VJZ5OFnro0jZLDv+yFz1/UFcAcZig+SFcYi6SxJbdmY=; b=hkZ+jUnVqOu6174bO4BzGt5lexto+LJmdesbL/w/9RSvjEKTMLuq8a5tWoG33jPQr/cQA+ Uev1kDGs5OwYEySG6tBGpzvrSepbz+cPds5K0jx3+3wcglbvuxHgWcr0st1yZniNjTpKXM SLutcenvnndzubZrPLbAD5I092wKIbZ23HiEWH+yo4H1O4Es+T6vOUhe92eyqTGde515AR FYJ/jVZ64VU4rF/3T5+JB2QSEg3KU1dHjJPMYz1AZL6Fw+pp8OzATNZ2G28LpYqZA4bdKM brHTQIPw8adLd2wnrnKQV4kOKMNXq3qg+CbQ3YyfXC09wbCpjH6wc9grR6TsDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592454; 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=VJZ5OFnro0jZLDv+yFz1/UFcAcZig+SFcYi6SxJbdmY=; b=khTCjFjgwjyu890/a8UHEBi43rffPZXljPSQAPIoSiKp063cfM0utz36E6WRVPlrB5yJ60 238oVwo95efxe14RI1teuUr2ii4jcws5tl4QS16MWDa4WwmCsRgy4Z4HsWAaxcMdvUsCUe UkoeXGidA5R/neZPtdxYEVJIrdzyVkzfji4tlMsQ3Vpk5cFLYPzyVxhVgqg9691peJgEsd Row+gbLZVVZ6s5n8h/+iaWhDbDOgb9WaH4JoQYidizodeP3uDBew1aPF2sLpK/7qVKwGkt su9JCgo5VFFqCVxhgE9ZDHnYIHrEHr98O79sWyj+170hSeGF9V8TIPvsbubHZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592454; a=rsa-sha256; cv=none; b=EQ/S54dclQBCUFZiHBcTzQVR3zohI1pNgtvPr5PC0Az3N5AkMwq6N7ftLkcZVQoHOaMRV+ UuMNq1tVygYowe4mV85gTK1txFVRPyKplX01faPm9mI+aARnppOmZ435tjanyuEgesKrlm 31i4C5Hd1u+VdDajfuGZpeFzjTVoxeYOZfDqipF2IcjNnvIrbuc/EtSk7gGuYLA1fY709S kVRs8QxI/wXOvsNFYL9fbV64peGccOduI9+jsEiveHilLCtLamumVDlNBQtYzQCQ+TE5pj 2v1pca8IZtUHH3MziOwQofRFC6U7Wm+7N3ZpYO8+JCq17pXR858ppRcywcSknQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dt9FK6X02zCLw for ; Fri, 16 Jan 2026 19:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: fe8793b39bef - stable/14 - LinuxKPI: correct the LINUXKPI_VERSION check for abs_diff() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fe8793b39bef5a035aa4dce6fd8479f954ac5845 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:53 +0000 Message-Id: <696a9445.bb64.213357c4@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fe8793b39bef5a035aa4dce6fd8479f954ac5845 commit fe8793b39bef5a035aa4dce6fd8479f954ac5845 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:23:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:47 +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) (cherry picked from commit ab45c859374d750a6b68292cf40889b8ca5db04a) --- 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); \