From nobody Sat Feb 17 21:32:54 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 4TchqC35x2z59ktd; Sat, 17 Feb 2024 21:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TchqC0kxxz4hG0; Sat, 17 Feb 2024 21:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205575; 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=ClISG2XwM/Q4kifHvtAiH6RQS0xQo/oXOkzJQCi6N5U=; b=OjRI1pc/O9gaiXm4Gx2jE8VbQT41r0OtlogGWg2qThinvK1u1I6iaMG2qL2Un02c+dvjkk iPGFbFKrT8glLvzYxVvCL8uPBsDqBKF9VJvHl6+700dLpaxoZRqPbgEElB7QtFkafClHc/ FTx7zvMTWw/alp8Xyrn2M8ZQrAiwLQyvW9lO6hDmbp6iIvj3IABuKOoUazfreoKujpq+Z3 qICUfjutP0o9O0mMoJy1Z520m0yawc9oofcdUIyBj8OmpgMYIaVFhqieRsfeALy9CHcTTu 2eq+nnNHnXhATeDn5z+MhTK3mwfSui5MaOAh9OaZLvCQfWFFrShDDF/cqLYd5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708205575; 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=ClISG2XwM/Q4kifHvtAiH6RQS0xQo/oXOkzJQCi6N5U=; b=OwYJVQEZyyadDFSgn0hRYKhMnyPKKR0VCAL9q9xqyfXBVnBiCmBV7JEcm4YBPcv3AVJK7D GBRj/9sJ3u0bsyynN+2uBvEL2fFyRs/+8qzm0XjHlpyVD4E9ZY9U7qcg7Zm0GIRaEOWP78 E+m76ItHIOgPsnltJs6tBR9W9Vc3iImGcERgdlk0ci6s9jyXO+bu5N9OwPvJLkZWrNFTfp 0VpQ54CkxrGNKacS4d1MqR09GnkQeSa17r54hLbk394edF4/pyLYzyoj0W635EPqZ7kC59 5sXk+jOFt66E87NC3/UMvmxLnYQMD3oPk/67ZGEiIifuHaHquJybgwDa+fTPxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708205575; a=rsa-sha256; cv=none; b=KdzVjArUmMplkTagv0YjIdmDQ0U6Wmlx+5VIYVRxD3APV64Y50yiK33lkR88KollqpgZrY GDJV7r1oIiXTDu2v6p1h3iHvk0tZ8cBZBl3J5lAgr2A5PglWcrCQAq3dDqx9k79tUGPeUp cO7K0cMsBWeVVC/u/RnWUwASbOJavhJz6rbbSvLhwe2tEX6/c4UHpnH8yQRfViFp1DvhNN n2rR7K/4eHmxo/UjpP6U0XTOFKZI55ahxGV4a6Ogx1sSSRAgIE8ab2d9aAYa/6sEH6+Bn6 RC3gEzoamArqmywF8C/qtFCplHYOxGnPQ1JRsTqCi/YGrxsTP3o8jY/XTA8TUA== 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 4TchqB6y3zzPZW; Sat, 17 Feb 2024 21:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HLWsFM020583; Sat, 17 Feb 2024 21:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLWsir020580; Sat, 17 Feb 2024 21:32:54 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:32:54 GMT Message-Id: <202402172132.41HLWsir020580@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: c254bc21dde6 - stable/14 - LinuxKPI: Add some header pollution and dummy headers 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c254bc21dde603b86f602257710da07e22bb6c07 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c254bc21dde603b86f602257710da07e22bb6c07 commit c254bc21dde603b86f602257710da07e22bb6c07 Author: Vladimir Kondratyev AuthorDate: 2023-12-24 08:19:58 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-17 20:58:37 +0000 LinuxKPI: Add some header pollution and dummy headers required by recent drm-kmod to be succesfully compiled. Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu, bz Obtained from: OpenBSD (partially) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42798 (cherry picked from commit 1bce29bcf121c1e16205fabb100f798d88f757c1) --- .../linuxkpi/common/include/linux/irqdomain.h | 10 +++++++ sys/compat/linuxkpi/common/include/linux/kobject.h | 3 ++ sys/compat/linuxkpi/common/include/linux/of.h | 33 ++++++++++++++++++++++ .../linuxkpi/common/include/linux/shmem_fs.h | 3 ++ .../include/{linux/irqdomain.h => asm/neon.h} | 0 .../linuxkpi/dummy/include/linux/dev_printk.h | 0 .../linuxkpi/dummy/include/linux/device/bus.h | 0 sys/compat/linuxkpi/dummy/include/linux/mei_aux.h | 0 sys/compat/linuxkpi/dummy/include/linux/prandom.h | 0 sys/compat/linuxkpi/dummy/include/linux/sysfb.h | 0 .../linuxkpi/dummy/include/video/nomodeset.h | 0 11 files changed, 49 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/irqdomain.h b/sys/compat/linuxkpi/common/include/linux/irqdomain.h new file mode 100644 index 000000000000..c7788e51cc89 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/irqdomain.h @@ -0,0 +1,10 @@ +/* Public domain. */ + +#ifndef _LINUXKPI_LINUX_IRQDOMAIN_H +#define _LINUXKPI_LINUX_IRQDOMAIN_H + +#include +#include +#include + +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h index 06d71faaa873..7aeab3cf05a7 100644 --- a/sys/compat/linuxkpi/common/include/linux/kobject.h +++ b/sys/compat/linuxkpi/common/include/linux/kobject.h @@ -35,6 +35,9 @@ #include #include #include +#include +#include +#include struct kobject; struct sysctl_oid; diff --git a/sys/compat/linuxkpi/common/include/linux/of.h b/sys/compat/linuxkpi/common/include/linux/of.h new file mode 100644 index 000000000000..fb4554a8ddbc --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/of.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 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_OF_H +#define _LINUXKPI_LINUX_OF_H + +#include + +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h index d373cfa1d611..efa2c855fe7d 100644 --- a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h +++ b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h @@ -29,7 +29,10 @@ #ifndef _LINUXKPI_LINUX_SHMEM_FS_H_ #define _LINUXKPI_LINUX_SHMEM_FS_H_ +#include +#include #include +#include /* Shared memory support */ struct page *linux_shmem_read_mapping_page_gfp(vm_object_t obj, int pindex, diff --git a/sys/compat/linuxkpi/dummy/include/linux/irqdomain.h b/sys/compat/linuxkpi/dummy/include/asm/neon.h similarity index 100% rename from sys/compat/linuxkpi/dummy/include/linux/irqdomain.h rename to sys/compat/linuxkpi/dummy/include/asm/neon.h diff --git a/sys/compat/linuxkpi/dummy/include/linux/dev_printk.h b/sys/compat/linuxkpi/dummy/include/linux/dev_printk.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/device/bus.h b/sys/compat/linuxkpi/dummy/include/linux/device/bus.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/mei_aux.h b/sys/compat/linuxkpi/dummy/include/linux/mei_aux.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/prandom.h b/sys/compat/linuxkpi/dummy/include/linux/prandom.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/sysfb.h b/sys/compat/linuxkpi/dummy/include/linux/sysfb.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/video/nomodeset.h b/sys/compat/linuxkpi/dummy/include/video/nomodeset.h new file mode 100644 index 000000000000..e69de29bb2d1