From nobody Thu Oct 17 09:16:47 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 4XThzg66ywz5Ym52; Thu, 17 Oct 2024 09:16:47 +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 4XThzg437Dz4Hg6; Thu, 17 Oct 2024 09:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729156607; 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=9s9xSgJSQl6Wfor7ocsKtx8OA1OVsZdHqpUz7Enh8Gs=; b=FluZqW2KY2KL9W+otELb5av3gdd0m+jjaubX/1liK0adptPyZfxKUhWDFvFMB/sRFJX2It 5IbJ27jN7hemvOdHNMaGnHg2asm4r5T/lyUS+SNN5MDnAI6s8xgfIdFKvY+0CTH2Re6sNX ZaLDHiMzJm6ASrj4Wbe9IxczFek2R4k7Nm9eW/vgKuEj8cUaJGf0mK9dbYW4GgtXFMe7xi wYvO8iyQASJ9/Kdv43OZrIOp6B3CJxdpWlCtwzmBonR72VPcUDBUgznZLH72ZLdsuIhQKV v8Kz+CPfvOrwsboh7tvZjyCN7P6n+PE/GVqzWThr+WBIPajmE/xsK9UBTLETAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729156607; 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=9s9xSgJSQl6Wfor7ocsKtx8OA1OVsZdHqpUz7Enh8Gs=; b=PvrZx2EQGPahDVsM8hzp4pqjCjIAeqYQDtgbniJATrJedWvdA0ApjSBP7UKD6l7W4uVQRE Ki0+9aoQxS8oJ+g6pOPJogvvGQXvOxQzZ+uli8djn1UL/BpnokAu1qOqSHG9VylihQRGSb X3RXs9tJYP0WDVKoRS9kV+QwlKiTOUtcVmB8uxRahjkJjxcnhz5G4TlmSkuvh0pIi7ZZyr 7b+vWEXE+xV6iM969wNJbUxHCYk9zV2YPJv0qMtb7HojXEdtdjDpa67xpKZwzy+lmJKPPo TfbGIwFCUP3kWl/yIognQoc0D648fIIsbbI4SUwl/tF7Q5rERSv4f+oerttpQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729156607; a=rsa-sha256; cv=none; b=lOaakiKzdWIWtwudp59AWO7kMIkIKLM29E2X6SLgqovyGIhkNRviPsFa3Q6r1EGmB46PNk vPw66Ta3XFBO73Qcuzf2aV0WRlIvT5jXrjH323dNn8BVpK3h0RTnA68Cc4fq/T2hmHDsvQ JNSY0f6paagS9UU9EJva2JB+Zs+wGk7FiBoG1yKq/hpqH98AVZZLNnHAL3KP8ilYZiKDIu JMJIBGkQxWSkx62efv0a+syo7lfIx83m/p+9/Uy+gEI+YPG3GxzpGnOKm4OxKyMUPxWXy3 Ffg+L9qbBLFejwRbxY6j0l5ZJtBVwR9+v2HsZLJCHGyD/FxowxtKYxT4zgdACA== 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 4XThzg3cTJzkRn; Thu, 17 Oct 2024 09:16:47 +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 49H9GliS087717; Thu, 17 Oct 2024 09:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49H9GlIM087714; Thu, 17 Oct 2024 09:16:47 GMT (envelope-from git) Date: Thu, 17 Oct 2024 09:16:47 GMT Message-Id: <202410170916.49H9GlIM087714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 20fe7e889f3f - stable/14 - LinuxKPI: always include linux/kconfig.h 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20fe7e889f3fa6cdd3587ee03cbd2fe4d9d38041 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=20fe7e889f3fa6cdd3587ee03cbd2fe4d9d38041 commit 20fe7e889f3fa6cdd3587ee03cbd2fe4d9d38041 Author: Bjoern A. Zeeb AuthorDate: 2024-09-26 21:36:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-16 21:49:45 +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 Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D46801 (cherry picked from commit 41283b454b7abd3de251ec8234d19b67dbca3916) --- 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 53b9862f2145..6c027ca7c208 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -318,7 +318,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 48872f88932d..9310f1572b41 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