From nobody Mon Sep 15 19:11:10 2025 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 4cQZPp3vsqz67sdy; Mon, 15 Sep 2025 19:11:10 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPp1mh7z4FQV; Mon, 15 Sep 2025 19:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963470; 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=BB/ROqrld5XbbeL3exq9RINmiHGeK5ll9PflvufRsms=; b=VPsMDZOygl9FOIjh1BngyHPVF2ujyYZhZoOXiASWngCpUZV7k+J9qlG5LhUruDWZ/L4AVl SdxtqZG4XUbpEkOLpCYJorFxEyKkPJzmaU2lthE/AdsLmWx4ddqtBxBO7P6ziHUbA3j47w oC+makNiKolN28BIF83+zDMLGzG94rHLojfty+SnvgG4j4qe6q4r92UHBG3UlfNn2GUpo7 Y3UKgv6lYjD3YBOLzGIx2FAmOtxAB32dGfLKWIVXYg7KaWg1tzmqHlfV4Eex8sjA87nfud yLwwSVxLXrmM26IEn/ujgfc771z4LUOQbzLNEHdYyAoY5V+7SW2VIYWcu0/9tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963470; 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=BB/ROqrld5XbbeL3exq9RINmiHGeK5ll9PflvufRsms=; b=YQGG2PqnlRE+RCmdTYuubXVd1BNouWaw5wGJnDwwkNtrRpcfcKSpt2W7E3ZV3Em9elKmw6 N2bjuezsYiv02OkAXec4Eg877LPbSDqlKLcAO9reAiT+cTMiim8u+MOscpLGYhwkfVQnYK 26TR+kwnDuFM0yNwlttEk6Hyl6waAdRMwmO4vvUzBad52slZ8gycw47BhRVS/SAhiQ6S/X 4+oZKENu0Iq/al7L1EqVSlk3kHzBwrr242JxuhrMGPdpbIq5duWoWLKI6ngwb9SSVP2BRm 7XBpX3LKUIUoCq0oDuEy4L01q7y7dLJtI1G7DQxzbVvndApPZfqNtNdOqj32mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963470; a=rsa-sha256; cv=none; b=yUyeci2jHZSODJJBHViZXPebLqjalWAriP/LEU46bIOSTaI6fc1FwFl4G/dl42MPjVIWWx ox1ZnTKZi7U1Q2JJOCcbAUL1amJmuK9+zaBYeKrozaW6PMJYl3FNeNl0F8uTH0wMqsVl8k D8Ta05b7MpFrtAraNMImu+0tUIj4bM5RUKhMnnk9WKWfuVx4Vdy2C++/gVb+Mobvxy3Nkh cQSvzPzi2yeXIzIyRWbi7DIwvfFYuqHj9bNXQNcIPgd+phXLu/Yo4K/cvpKIjmmdErvlB+ bZ+x5M0LwJbLNUrKSEAWLiPoy1xZccl1uUdBMkdDngNvqGZu1oNxXOgtgKU9dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cQZPp1681z15g4; Mon, 15 Sep 2025 19:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBAsH049737; Mon, 15 Sep 2025 19:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBArQ049734; Mon, 15 Sep 2025 19:11:10 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:10 GMT Message-Id: <202509151911.58FJBArQ049734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ab45c859374d - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ab45c859374d750a6b68292cf40889b8ca5db04a Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ab45c859374d750a6b68292cf40889b8ca5db04a commit ab45c859374d750a6b68292cf40889b8ca5db04a Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:23:00 +0000 Commit: Bjoern A. Zeeb 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); \