From nobody Sun May 12 00:08:33 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 4VcNJ237tTz5JbXL; Sun, 12 May 2024 00:08:34 +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 4VcNJ20Jtmz4tBc; Sun, 12 May 2024 00:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715472514; 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=WeDtAV4hKDQofRAc4Ffg6vNSewD3PQNvGg6hcsSK7HE=; b=IFvsw3HcRo3KkfIbk7OJh99DxKQBfQFiHd/3E1dhLj2yY7yN1Od3d4iAPpdAqMDvVF3nMs 2g8rnbAphiMtJRSLfjG3R/MYbvpienfd2j7IxmzNoUJo2T6q3jz4erAeBda5cflZFvxkE5 ohPLQ6Mf5KYPZjmiuU/2VWOlt/k6U0dUdIIRNzESr2cFrJsa7ojUEoW1hOeJ3pZfXwPLbJ Wcsci9y6k80/BPMVb95zmq8g1LcDXJ3NAj4/8RCxGTEOSCl4immRTJZwjI9XwJM9fX6l9l mJ14tGp1B/JqYJKKKj68korK959NVrF7ZMI2t7ER6P2Sn1cEgxogGRCEnL8buw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715472514; a=rsa-sha256; cv=none; b=taq948WEsKaCUt69NuGrI2A/SL+i5gH9xQ27qNlKUuIIz0aU2cfUpTzVJR4N+FpQBp0vPp RkBiR6Yds/HwezRYoG6ksj7cnurnLhgvCGPPAuQxHN9FhgFK6a7earUQd44z9NQ0mhdty+ biAdzaSbEaE3UgLSOX31R23fq0U0ZOjrOiG5H9o8XOUawJeANHRSaV6tAJYAonBS28wWMJ mS2f4/2NjJ4zbljvmgDw3YEF7kd3kWJA5HIrpQq0GLuDYNiOJrMvitg7FJozPmNDSFmMVr 2PH4joX+iQRbBLSY/VtuQtlt7fciz/SgsoRMF/EGjYGZJcAmLyX/zmWQFuv2iw== 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=1715472514; 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=WeDtAV4hKDQofRAc4Ffg6vNSewD3PQNvGg6hcsSK7HE=; b=ni8vtCMbC4KqUfo4wpX0mbyOAtXE4hKZML3dVT/YkxSg3Lqh597MgRD9BpoSEFpXFanp98 Ua7FGopbVbsW9MNC+2CPRcr3bIUdCoo1rvSA4WAeOp4xXtl/wzS7W8D1O/+UD6HgQOBvOQ DvUOr/vRfhNOEtUvv/TsWt8Kqx3CiHJw+UMG2h6KSpuOuOk/DFWxrV0PF642SBFfQJbeSq 4ry58ilr2mqRMk3Z3jhRPOCamrxqPH4PpvldEKjeRUiIDJy20n1omnEu8C+rxe6ydGX6/m NIns2UH/Y1FdSP3xUwrKMZ/CCA8J+JETySVTxzSvW1t1RzgEWoHCqIphmpT0/w== 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 4VcNJ1710Hzhh6; Sun, 12 May 2024 00:08:33 +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 44C08X2C002084; Sun, 12 May 2024 00:08:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44C08XWl002081; Sun, 12 May 2024 00:08:33 GMT (envelope-from git) Date: Sun, 12 May 2024 00:08:33 GMT Message-Id: <202405120008.44C08XWl002081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jake Freeland Subject: git: 39664f1b7b56 - stable/14 - capsicum.h: Include ktrace.h only in kernel 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: jfree X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 39664f1b7b56332a6a68ac072aaca68f4fd4697b Auto-Submitted: auto-generated The branch stable/14 has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=39664f1b7b56332a6a68ac072aaca68f4fd4697b commit 39664f1b7b56332a6a68ac072aaca68f4fd4697b Author: Jake Freeland AuthorDate: 2024-04-08 13:27:17 +0000 Commit: Jake Freeland CommitDate: 2024-05-11 23:57:44 +0000 capsicum.h: Include ktrace.h only in kernel Fix cross build failure by including ktrace.h only when _KERNEL is defined. Fixes: 9bec84131215 Approved by: markj (mentor) MFC after: 1 month Sponsored by: The FreeBSD Foundation (cherry picked from commit 34791f4ac79ee41f6986178a3a89d13f37ac156c) --- sys/sys/capsicum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/capsicum.h b/sys/sys/capsicum.h index 05712abf37d1..e2f305462f0d 100644 --- a/sys/sys/capsicum.h +++ b/sys/sys/capsicum.h @@ -45,7 +45,6 @@ #include #include #include -#include #ifndef _KERNEL #include @@ -418,6 +417,7 @@ __END_DECLS #ifdef _KERNEL #include +#include #ifdef KTRACE #define CAP_TRACING(td) KTRPOINT((td), KTR_CAPFAIL)