From nobody Fri Oct 11 20:51:24 2024 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 4XQJgw5MNXz5ZP94; Fri, 11 Oct 2024 20:51:24 +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 4XQJgw4tnKz4JCm; Fri, 11 Oct 2024 20:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728679884; 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=731mremlgxjlGYTvusKHLqqXshtrrZr+m9gBFjTyHLg=; b=Mu1P4D4IVfqOzjZSgpFDTgr9Kklrh5/LgJnNxLZZWP8BEHFkC1LefPK2dft8cZwRLatvzt fuV+hLh2paBsZDFjpfZJX8upYwrYSxXucWmzHE/Yk8LsDuZJZl+Ij9bav4m++X6mbyh4Ot tsebpyqXnAnMaaQyGBnT+s21pZuh2+R7K/pn0Nl7+o6T9cTJY8d+GQ0dluKYnb0EBttGsV nQFdW0k/nxOFm/U+04AbvhgtS0kzh13Bt6kuzZEGQxCWq6/eWpnAntF/4gkokslMUOJv8Z IW6bZy7VYuD89hwvmuhixL9KwsBqMOaxFGlCTLDbgPJqEYlMMNoRlMEaS1omJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728679884; 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=731mremlgxjlGYTvusKHLqqXshtrrZr+m9gBFjTyHLg=; b=rAc8nAGi71t8mduG4wGPHAl+hHEYwmPsR07nU5Fkm6yjY1KsYLXqM+wy71oJub0f9MN6g9 w0N99/lForAxE2t2J82dPP3bf5i5KI3F9+cUgWQX0p1YKtSXpfBv6FL5NDZ0Xsxi73EU0w rO2p4kHtJgAQz81g870mjIT2m47hEpYb47GCOnRwzZiWKnbJbSldtEJqk9/QeL2bzOzIFL F5b9SSjlwrNMDVg4kgCKUjpgvd2ehie6ix7HX5pkHm4rdNROuVvPVkamYEq2iz/mvrCl0T 2C+WLlc/u+KTkaysMTEHxkNLp50gwTx2g7JplKEaKcoqWI7szTbcxIkmejWcVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728679884; a=rsa-sha256; cv=none; b=N9G2swW9HmUWYPpKwaAXGagj+MbMf5rBgfSfhRjRmmvhNVWnBpXb82qmPlP8R4pYiZzHNs wLcERp/eQvTxS8vt6Kne3EtomzGcc1LrjBTKI6pnrksE+DzkX7w5z5wilA0yFhdXLh0bZ0 sc2t+ce8K5B+bOtlN1zhcGmSOK+xpBXCXcNdifhEKU5mXyGyKFySc2a969s5IClVEXOEGg 5Xy1vJLP0E0kHRmypx1io/irGj0A7JwafLjwYaMSYuekh/GekCiSbs5q6KFOyioOXyLwJ+ 8Afp+qS43mxPO/FcIrJTvIHrHU9/T/2xuKOCck8yqj/syzLi1RIezVxWASjd5Q== 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 4XQJgw4V7pzwyd; Fri, 11 Oct 2024 20:51:24 +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 49BKpOkp091944; Fri, 11 Oct 2024 20:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BKpOsk091941; Fri, 11 Oct 2024 20:51:24 GMT (envelope-from git) Date: Fri, 11 Oct 2024 20:51:24 GMT Message-Id: <202410112051.49BKpOsk091941@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: 41283b454b7a - main - LinuxKPI: always include linux/kconfig.h 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: 41283b454b7abd3de251ec8234d19b67dbca3916 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=41283b454b7abd3de251ec8234d19b67dbca3916 commit 41283b454b7abd3de251ec8234d19b67dbca3916 Author: Bjoern A. Zeeb AuthorDate: 2024-09-26 21:36:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-11 20:50:27 +0000 LinuxKPI: always include linux/kconfig.h Always include linux/kconfig.h which seems to match Linux behaviour and avoid errors compiling code expected from that file but never included. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D46801 --- sys/conf/kern.pre.mk | 3 ++- sys/conf/kmod.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index c676418aca93..50a81a29d18d 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -324,7 +324,8 @@ NORMAL_CTFCONVERT= @: # Linux Kernel Programming Interface C-flags LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include \ - -I$S/compat/linuxkpi/dummy/include + -I$S/compat/linuxkpi/dummy/include \ + -include $S/compat/linuxkpi/common/include/linux/kconfig.h LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES} # Infiniband C flags. Correct include paths and omit errors that linux diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 4dc66c69d67b..03bf42f5b413 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -109,7 +109,8 @@ LINUXKPI_GENSRCS+= \ LINUXKPI_INCLUDES+= \ -I${SYSDIR}/compat/linuxkpi/common/include \ - -I${SYSDIR}/compat/linuxkpi/dummy/include + -I${SYSDIR}/compat/linuxkpi/dummy/include \ + -include ${SYSDIR}/compat/linuxkpi/common/include/linux/kconfig.h CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL