From nobody Tue Jun 04 11:19:41 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 4Vtp5n55jWz5NFxS; Tue, 04 Jun 2024 11:19:41 +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 4Vtp5n4VDdz4Lvl; Tue, 4 Jun 2024 11:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717499981; 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=JNSiRuwr/xvJVmeaDCw+W8I3VGw1rdlOflO8pP3nmxQ=; b=RPyHdq++6ZPb+zqQSP62pmjQo6GEesqCO+C+wsWfLhO8C5hE7erwp2a6vGy1LS4biXeKfH Nl9kF46oo9SL/Iu4mODL2qDt8I+YozmaOnjG9XQuAbcLIpTNt6kvZCPFo2GBjKFYjXFc32 5nzcPtlsRk8rTM5G2FI47gT+DLKm1UZMAHBco+ti0raqu/7qQKgdp3tze0NcQFJ1q98kXj rStq9wuiQ2zBAyCfY7arPrnlhYuZirGCAiYdvqjiT9GMshnjZl2UGOUyB9DDNgqv1zs2g1 /UaV11gcAiBq5AARdPWzfTs83sCfglp/Gcsd6C1HgZysCjV7TALPN7oMDCV1sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717499981; a=rsa-sha256; cv=none; b=vimkira3/wXJfQjetbHHHRnkxGW7aHT0lOM7LC5RzQmgCKKFLWZ/dnPWUS5Bfcnj5G10Ah NWTsmcfIESjYlBQbdgcbKT568ingSr4n9VeNQfLk5ckQK3QtI7OK1tVvYDOphJGCmY5+Cj QFOIHnFSD5L/lXN7Q1sqeOJToTB40vLJmVFCrEpT5h8x2dt95H11UP2nfTptLMhw3x/oHX 5wAK498in/Ysh2NEm+kyRKDV4jM2jcfzhfgaYmyhIMrIncafhSMfErNY1FDXsPr+hp7X5n RR0TdMYmPUFPKMn4DuuxFZZnh6vwUDIsGgZFTMnMTMMscGdbO0yw+fPgh9ydDg== 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=1717499981; 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=JNSiRuwr/xvJVmeaDCw+W8I3VGw1rdlOflO8pP3nmxQ=; b=uh8nc82D608l2xA4eWntdP/R/O2SR6z2i18WPZJAp7QLwvEpKabfgHhSS+bMDBse6BciLB SmRbPYmAQDLZKqVU8XPIEFczn0wKBiquvAWvqeC50+klb1VGzRyhjMYt+PhotUwxeVpy7h fg1ZXN2h0LH1ZSYCQZQu/gKJY1l6hxYgU7gXhUijYV3CgJjqJJViFIY4dedpDSMI7AjrTK 3+Qtd6GZGrBzWUgTFvkW6VXq7z91jnvACn+hk7iUXDbuR1AOH3v051sXI0sKNCPNru2FG3 aa8c9VY8lj6mksITzlE+NSPrxmfHWKYs/BHqKdZD2n5zFEZnOo28NKKC+4nWhQ== 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 4Vtp5n45VyzGxN; Tue, 4 Jun 2024 11:19:41 +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 454BJfoR077757; Tue, 4 Jun 2024 11:19:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 454BJfSr077754; Tue, 4 Jun 2024 11:19:41 GMT (envelope-from git) Date: Tue, 4 Jun 2024 11:19:41 GMT Message-Id: <202406041119.454BJfSr077754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 13671022ebfb - stable/14 - linuxkpi: hdmi: Split the module declaration to a new file 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 13671022ebfb31ad49480973801fb4742a773a20 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=13671022ebfb31ad49480973801fb4742a773a20 commit 13671022ebfb31ad49480973801fb4742a773a20 Author: Emmanuel Vadot AuthorDate: 2024-04-24 07:59:20 +0000 Commit: Emmanuel Vadot CommitDate: 2024-06-04 11:06:40 +0000 linuxkpi: hdmi: Split the module declaration to a new file In order to have a proper linuxkpi_video kmod, move the module declaration to a new file as linuxkpi_video will also include linux_hdmi.c Differential Revision: https://reviews.freebsd.org/D44926 Reviewed by: bz, emaste, wulf Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 7f84bb34a1d191949ec519a01c0c574f5e827c88) --- sys/compat/linuxkpi/common/src/linux_hdmi.c | 10 ---------- sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c | 7 +++++++ sys/modules/linuxkpi_hdmi/Makefile | 1 + 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_hdmi.c b/sys/compat/linuxkpi/common/src/linux_hdmi.c index 172616306506..947be761dfa4 100644 --- a/sys/compat/linuxkpi/common/src/linux_hdmi.c +++ b/sys/compat/linuxkpi/common/src/linux_hdmi.c @@ -21,12 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef __FreeBSD__ -#include -#include -#include -#endif - #include #include #include @@ -1915,7 +1909,3 @@ int hdmi_infoframe_unpack(union hdmi_infoframe *frame, return ret; } EXPORT_SYMBOL(hdmi_infoframe_unpack); - - -MODULE_VERSION(linuxkpi_hdmi, 1); -MODULE_DEPEND(linuxkpi_hdmi, linuxkpi, 1, 1, 1); diff --git a/sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c b/sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c new file mode 100644 index 000000000000..b0d4c013a6f3 --- /dev/null +++ b/sys/compat/linuxkpi/common/src/linuxkpi_hdmikmod.c @@ -0,0 +1,7 @@ +/* Public domain. */ + +#include +#include + +MODULE_VERSION(linuxkpi_hdmi, 1); +MODULE_DEPEND(linuxkpi_hdmi, linuxkpi, 1, 1, 1); diff --git a/sys/modules/linuxkpi_hdmi/Makefile b/sys/modules/linuxkpi_hdmi/Makefile index ef843c726dac..dc19c0afeebc 100644 --- a/sys/modules/linuxkpi_hdmi/Makefile +++ b/sys/modules/linuxkpi_hdmi/Makefile @@ -2,6 +2,7 @@ KMOD= linuxkpi_hdmi SRCS= linux_hdmi.c \ + linuxkpi_hdmikmod.c SRCS+= ${LINUXKPI_GENSRCS}