From nobody Mon Oct 17 20:41:44 2022 X-Original-To: dev-commits-src-branches@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 4MrpnN4KjDz4fQng; Mon, 17 Oct 2022 20:41:44 +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 4MrpnN2Q1Qz46M5; Mon, 17 Oct 2022 20:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039304; 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=y3AxzBH6OX/UJRQGmZGauRYQ/Mk2kPqMkfpzoYOgr5A=; b=Zyej71+T6cxGQZ+gciLOf9GseNeOFrNDj2apaKj8wG+ImEyOUsiYbjK3v6T+vrROFcON4D FrYhVzJ1YoNTdcDe/7ZtruBck8y88dX9AdAdL8n93E8Lss7wcptlYc+A61TTO4NThcTbF8 JPbI0A1p1O4uWuN2vU9WECWLAmOn6VuQyLd2htMKmy4NBSkZ76ZqU5wj8fOFjxcKZhMTQy 5CEiws4KOrXyJTkleq6vtSdBcX1FUTyhTbitB/24dafdhSQsROuxgkKJvXN+TYD1Qq7RZ9 uQjE2ghgVMv6WGLEdIX/OoySpkxlwaed/L6yOabWYmeWOBZd4kXZhA04ZBjmOw== 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 4MrpnN0xqKzxQP; Mon, 17 Oct 2022 20:41:44 +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 29HKfixT096664; Mon, 17 Oct 2022 20:41:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HKfi9I096663; Mon, 17 Oct 2022 20:41:44 GMT (envelope-from git) Date: Mon, 17 Oct 2022 20:41:44 GMT Message-Id: <202210172041.29HKfi9I096663@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: ceee15225781 - stable/13 - LinuxKPI: add the "dummy" includes directory to builds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: ceee152257810d8379fe51c989f2b81c066cdd6e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039304; 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=y3AxzBH6OX/UJRQGmZGauRYQ/Mk2kPqMkfpzoYOgr5A=; b=oyqtzWZXhqcr/X6iu+ByK4uRAfRXaoZoy2DKNXqoDfEEDZoEwwITO81KGYQou/08dIGCVq kXpeHmxzCul1QbjQeP68ZGRXA/x8ecqkfrb8TE1FtC47Bgn/+9BrpxCIgst8zoaRGlFvK8 Wy3bqh/M6tx3UDWpsPciyLLCgB504KDCSicLNXrSMOn6YjJtXyU+sfJjJkEji9DY2geBHo 70QfO19DnZe5IeibveMWncGxqeZZpABI8baEsSI2aGIZ1+tHTdus5tdBr9zg7Pceq3CQ94 kkkHFR1P/d6N6N8kUtAUfpwFlp8fkChYdv+ihMPxfpGxz0dYZnDJ4TGl23NPsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666039304; a=rsa-sha256; cv=none; b=gaTGPXwbnhUEha9ERKy8SP6b5WySHTQyjThrICZXW0uXB0ZGVJ8yKnYM90vSoFbLp5Qj0k 7YTUkLVru4Kp3q0SCBzcG+gK0Lk6ZvhCWrmO6CDUIdeXxDJouB36trWTtG+itv+6lvp/Uz +vj0b+vocv9fRY8J2sTccnowA6N7nGUC6kfqR0Crso55prnNkPdiq1T1vdz9Pqs3vF8F99 VH9iy+aNapTKd2Ixov/i6Tz464yWrpcQrLo7PJ7bzz6K84Z5RkZR/v9LuyxZfxVPOvqkX6 8dy7Al5fTh/awNa5aQjOGPTGkcDL1hfg4Wb4VwNGpjfcZtbk2mUQyO7i4P/e8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ceee152257810d8379fe51c989f2b81c066cdd6e commit ceee152257810d8379fe51c989f2b81c066cdd6e Author: Bjoern A. Zeeb AuthorDate: 2022-09-23 21:25:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-17 20:37:05 +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 Reviewed by: hselasky, imp Differential Revision: https://reviews.freebsd.org/D36684 (cherry picked from commit f8bad56164a43aa108498a97bd0021a943c0a02e) --- 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 c4c63d591541..f2f69342c865 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -311,7 +311,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 36ea024dae9a..9faccaf76de1 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -107,7 +107,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