From nobody Fri Sep 5 23:29:00 2025 X-Original-To: dev-commits-src-main@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 4cJXbw3Cggz66Z3J; Fri, 05 Sep 2025 23:29:00 +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 4cJXbw182Nz40j4; Fri, 05 Sep 2025 23:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757114940; 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=b0YoK5j4wZVyBIBfErF3ttVuSZjX6SuLSUtYi1acuU4=; b=e0UBMuxWEUTs72sYryHNVNPDxrpCzfexD9ZqtPUjBkRnjCzZQPsVgzIAVK7Q5zc5m4q7Wv OTKE+POMcWNSu9xmhU1i+FEjYoYjq/zdbZRT5ZKI/yfsKLqTQJeGcLwC3AMa5X6Lj/yyZu hO5ZvMuqpvG4aUM+9rkKlBFTXqENGwIC8RfTfiZf4Pujl1US85GolAcb/HqiCccn91YPlW 4RQKQtrxzQbHurtrXZmpH2KXm30A3usRkZcgjRqmCRx1CyWPMMFn30Flx8vIDqDXf4/2C5 +CgA/msm/XaWrSu4PWTukWSPw1dgKCNJIk6m0BJZ800Zqy2QMzs96wIjWRHmCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757114940; 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=b0YoK5j4wZVyBIBfErF3ttVuSZjX6SuLSUtYi1acuU4=; b=dAffW2o1iRApjP/tpK/ZFhGG6qsgxhHnpxQkcybaaoaVlDTQjF+ZG5lZqQ4rcn/2jCN+S+ QXZWZ5UqhN4ELW/7HiPWqm3jYNR2Wm8U96OF7p4JD1Wq4ETvyBNbzAiufMXYVGZW0nfHtV NHuU35jQdohdAPUCByVdL0wGbvilQMFVCVTsltqLETUH5K5HlT//kxgVXhiZ1Sq8EUnaav j1vXcWeeEPrqXNejoYaRjUzfUUBrWSeOPekf1SPaO3s5irxvHMoqmwAkz7G9wXxfbniUu/ xF+GhGT7gXSKS6Aj0+cH8l+Zd5iho5UQkWjjr+TTyEPAX5vfY4XZkTupJcdTOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757114940; a=rsa-sha256; cv=none; b=hqz05xbzWvNRz+6xWjJmHY3/kSECIUEt5BpN6hGfse06ivJB6u9twe0fAhb0pQRmzNbB7p aWuTKp3MjEgzHi7q4jhCN5PiOkBZG3+lQhXwxmYB35Y2PLQhmXk7tWdSQR+aSwwrwVsaDO a3E5Xo/YXdquMs2UDINHexr3Cwdv9HnWQ0wKJjkwp0EUvJtwK6y6rDHQq/d5CDk01rPJhb 1zleDBIywhPJX2iTqCQRmyJuRORz8q6iA7+3XIjM42AjICEUpGn2IhjGeIt5tTcL+CWNIP hlWw82NUCmx+hxBgFPrbAOrxEhsNYbtZzg7X9CaBKo5qlh/D0sKGhM+gScHeYQ== 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 4cJXbw0jCMz17q7; Fri, 05 Sep 2025 23:29:00 +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 585NT0Qq029214; Fri, 5 Sep 2025 23:29:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585NT0AC029211; Fri, 5 Sep 2025 23:29:00 GMT (envelope-from git) Date: Fri, 5 Sep 2025 23:29:00 GMT Message-Id: <202509052329.585NT0AC029211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 736b16e88d23 - main - LinuxKPI: correct the LINUXKPI_VERSION check for abs_diff() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 736b16e88d2384f9dd0ec11c0492e825b8d42193 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=736b16e88d2384f9dd0ec11c0492e825b8d42193 commit 736b16e88d2384f9dd0ec11c0492e825b8d42193 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:23:00 +0000 Commit: Bjoern A. Zeeb 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); \