From nobody Mon Sep 26 19:40:03 2022 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 4MbtPv4fQrz4cbBM; Mon, 26 Sep 2022 19:40:03 +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 4MbtPv46z9z3cpZ; Mon, 26 Sep 2022 19:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664221203; 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=RNB7FAiuF+mk17XWkkMA1N+/Av7/k6O6afkbLB/+8Uc=; b=mhEnA5+pCQl3muNypoiZqgTILDd5y4oHAM5ZCoZV2Vhrajxuf4kO38PuCskH7imiZEH+r5 pk4mOKE89iVEdydwUBXQbt2RR+LdHIx0pB2BeHyYg0DNRd9RrwJlj897P58BB5iyautSz4 Aw/u0eLpkDZ+iXiWNDeEUz+/qSv+OLnQF9L0B9iOSrqlHxCDF6OxoqSbnRFpCaa6+dn0S1 yd4OdUd2etISjOahmsdsmZWuAomOwATPW/ZC9fTml13n+KFP4KeQs2NaYTBfd+eDMLPvam h3KrcYv2iN6UDIJO0LuS1WVAk85UoWsLXzXbjZBjDvUlCjtBa7Dyc0TQEAeqGQ== 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 4MbtPv26JczsVH; Mon, 26 Sep 2022 19:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28QJe3xd053083; Mon, 26 Sep 2022 19:40:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28QJe3L4053080; Mon, 26 Sep 2022 19:40:03 GMT (envelope-from git) Date: Mon, 26 Sep 2022 19:40:03 GMT Message-Id: <202209261940.28QJe3L4053080@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: f8bad56164a4 - main - LinuxKPI: add the "dummy" includes directory to builds 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f8bad56164a43aa108498a97bd0021a943c0a02e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664221203; 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=RNB7FAiuF+mk17XWkkMA1N+/Av7/k6O6afkbLB/+8Uc=; b=FhBsF4llyhr7oIYJ8hKv4dK4mRFKU0RdIbmffGEPKt7Pv6Px1xe1B+5dPA+hoJ4c/KBbhl gD790jfQjf3V1RSXV3sBLc4zw8r27mvYHsPPMbtiv8eyS1Yiqp5UgLV3YdZ+v99ZBjE7K7 l9Go+RNkQ5NGA4uoKYGb6IRNLyC/NHCoHpdRVli/veEEyOpkZ8s4rb11LsVbnjAZXi/yhx akQnPlRyCM71ZQmmcnMLbpfxLjnC/OAhghHHxt31gOmXLUBTS2GCPhhxU7d58s6xUrFsv5 zUetRC93wlhlhY2tf2yD+rVbG1O6FnBSnRzYl0P6AsWgPgXgf9bMr2W3onBxLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664221203; a=rsa-sha256; cv=none; b=I7GWvZjNN0ZzBZ1RyZakwzF0wfMJdnXnAFVeVfArLIyWFNAEPzOHh4Tk3s5Wh4zMytqSpf 8pMyPJ66RejOCCOkZ+qwzH2aGsO7EBHCsBJoMX6oCGAeKa3v8Sibh3TxOj/T3FNflcSWOK +fUYoYh9u2OvOekoyHsyCkgYysYNRBVOrtzlsOh/cWs/u9/uMkNBSX/eG8E/4/6OXDy44N DknJi+4aqYSNsupz8m1+Zbg9ZPY9JXDTe6lK9OvEArtoE7W+STvDNedI15/mR82RLTNPV0 TLeVeKXKyrAIXfIo8yt5jOb3X+o+qK/m+X7t/6v6kacx2Odn66I9wuFpArsvHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f8bad56164a43aa108498a97bd0021a943c0a02e commit f8bad56164a43aa108498a97bd0021a943c0a02e Author: Bjoern A. Zeeb AuthorDate: 2022-09-23 21:25:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-26 19:36:44 +0000 LinuxKPI: add the "dummy" includes directory to builds While we could add the dummy includes directory manually to only the drivers needing it, it seems a lot easier to simply add it to all without any expected harm. This is needed for more drivers (and to remove some #ifdef in current ones) with empty header files being present not yielding errors. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: hselasky, imp Differential Revision: https://reviews.freebsd.org/D36684 --- 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 75f5128c52d2..edde63e6850f 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -293,7 +293,8 @@ NORMAL_CTFCONVERT= @: .endif # Linux Kernel Programming Interface C-flags -LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include +LINUXKPI_INCLUDES= -I$S/compat/linuxkpi/common/include \ + -I$S/compat/linuxkpi/dummy/include 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 b9f3a6ce006d..ace2f4cc3d4c 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -109,7 +109,8 @@ LINUXKPI_GENSRCS+= \ opt_stack.h LINUXKPI_INCLUDES+= \ - -I${SYSDIR}/compat/linuxkpi/common/include + -I${SYSDIR}/compat/linuxkpi/common/include \ + -I${SYSDIR}/compat/linuxkpi/dummy/include CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL