From nobody Thu Aug 01 22:27:51 2024 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 4WZkB13Hfgz5RZhk; Thu, 01 Aug 2024 22:27:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZk9z62l3z4ZDL; Thu, 1 Aug 2024 22:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551271; 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=qCXI1FLs8H//PoPVJHJc7UTEcujLD5oGtFMgwWaalSI=; b=qKEEL/vUiww8FA+eHtgzHq6DKka1e37fQOUD/z719uAMdq/p1eJ7b6/Vjy/9tt6e1NbEco es52a3MXqAy/LwTNI5x64ekgAt3McOvW4q/yweaaZGpNpmKSGGwx5MczAa46S85/PM96pa eJhiFWl7IwgfwQQ+wSeqTBUUN+hs3dAsjJIs58Q4zi92+MBbD0D1RVgvtpzhL78le8AbPm Fw7umPKCo4v5/doN2GVAE/fRx5sJYbIIslOYnMBkJIr/aedp74uIEMInjSt8g063zV6w9H ewMgwYft/0bgMQlVcMCDBWxckGS5xwR6PX0UW+klOK8kwxvE+dYUV9HqFYPY+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722551271; a=rsa-sha256; cv=none; b=u2EcNQwdbfpF7XiE0uRuIdUIR1FkWDu4fpUvO6Kz2s7N+gMN0yHfG4duz5fO4dSC+ZQi9e CTLKHbv7eEJCVTizs12om5b3MVIeFyw1X75pTZw+zi/Oyn/U5KqqD1iB2BCNWnwnds1FgD fKDBPmXxnFM98yILJGm3Mnwi7kGjB5hh0RZR4pB+P2KDXNdJvwSetUu324FZY7zWr3qP4Q 7KXGFDi4IO9j3nc6878AzA7h2ev96acJZx+hT4mPq6C85enUoX/3ful59d422qwVHVfgfF ICvAvtUOsp+ltZJa1Z9CRIxahMyXde7kfUxh3WKOvuzClN+cddRzXOYRj0ssng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551271; 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=qCXI1FLs8H//PoPVJHJc7UTEcujLD5oGtFMgwWaalSI=; b=U6aB0JDXhbgL2+uQ4/gby2ZEvT/p4qX9aalmjZvMnwgD0NsE/m2PaJbRC12jfpKtr1jpoI 6Yz+MRPMLkNI6WoFa88d1VUMkwUU8I6oYqPwEca0HKtd7GOXHDlXtq2HRZx6+e9qe2BXO4 uu/MLAhumVMBH7rJkPCDIioamEMlqMwAB0VvMUT3MywnW71KM59m3RpnwvxPigWy/6e0Ya Y2sRlJbnLpj2iSZ4n7YuzFH/LMzYaBWUG+2Ti3myLsIyajEaGKwkiFmnEk59vnc8mW2lum /CAJUDTZftHLb4giWnvv5Q3UZrjG9OWss1yCylz3uoBl7adu3+ySG1wWGJlW8w== 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 4WZk9z42zVz12tM; Thu, 1 Aug 2024 22:27:51 +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 471MRpDI028133; Thu, 1 Aug 2024 22:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471MRp3R028130; Thu, 1 Aug 2024 22:27:51 GMT (envelope-from git) Date: Thu, 1 Aug 2024 22:27:51 GMT Message-Id: <202408012227.471MRp3R028130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: c0b32a4ea49e - stable/14 - LinuxKPI: Remove linux/sched.h include from linux/kernel.h header 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c0b32a4ea49e50ef45c0247b922ca68a4229b768 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c0b32a4ea49e50ef45c0247b922ca68a4229b768 commit c0b32a4ea49e50ef45c0247b922ca68a4229b768 Author: Vladimir Kondratyev AuthorDate: 2024-06-26 20:47:12 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 21:09:41 +0000 LinuxKPI: Remove linux/sched.h include from linux/kernel.h header This include prevents usage of any kernel.h helpers in sched.h and all of dependencies. Linux does not have it too. Fix building of kernel and drm-kmod after than. Sponsored by: Serenity CyberSecurity, LLC MFC after: 1 week Reviewed by: manu, bz Differential Revision: https://reviews.freebsd.org/D45692 (cherry picked from commit 256eb8d5361143b7d436a195530e0eefe1450e6d) --- sys/compat/linuxkpi/common/include/linux/gpf.h | 33 ++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/idr.h | 1 + sys/compat/linuxkpi/common/include/linux/kernel.h | 1 - .../linuxkpi/common/include/linux/scatterlist.h | 3 ++ sys/compat/linuxkpi/common/src/linux_rcu.c | 1 + 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/gpf.h b/sys/compat/linuxkpi/common/include/linux/gpf.h new file mode 100644 index 000000000000..01e883a94728 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/gpf.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Serenity Cyber Security, LLC. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_GPF_H_ +#define _LINUXKPI_LINUX_GPF_H_ + +#include + +#endif /* _LINUXKPI_LINUX_GPF_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/idr.h b/sys/compat/linuxkpi/common/include/linux/idr.h index ca3f8171ff44..7f55b8e57c7e 100644 --- a/sys/compat/linuxkpi/common/include/linux/idr.h +++ b/sys/compat/linuxkpi/common/include/linux/idr.h @@ -34,6 +34,7 @@ #include #include +#include #include #define IDR_BITS 5 diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 0b6bca5f388b..0786151c4ca8 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index e462d5c649f1..51ced19e6b5b 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -32,8 +32,11 @@ #define _LINUXKPI_LINUX_SCATTERLIST_H_ #include +#include +#include #include +#include #include #include #include diff --git a/sys/compat/linuxkpi/common/src/linux_rcu.c b/sys/compat/linuxkpi/common/src/linux_rcu.c index 20fdf186a78a..4515684aabc7 100644 --- a/sys/compat/linuxkpi/common/src/linux_rcu.c +++ b/sys/compat/linuxkpi/common/src/linux_rcu.c @@ -42,6 +42,7 @@ #include #include +#include #include #include #include