From nobody Mon Apr 08 14:46:54 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 4VCsPC0YPFz5H8XC; Mon, 8 Apr 2024 14:46:55 +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 4VCsPC01ygz44mp; Mon, 8 Apr 2024 14:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712587615; 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=F/FYcYQWq8ToW7Zk5ySWJZewFmqFQUfs+jbj/qncQss=; b=Xh5serpbHCarCP8K26ReXHkVXLQXgc4tIX59qsyUmKFzTvB3SNUKfUOgEMLuq+YOaEmR3D 3F5Vhq7/xA2tmt4wNNWTo1QGOn+GzXgtE1zhUzsKqLsyjT4w9Dkrbyihrpn/UgoRQKeT+P nZV6IIp1mFDHRqkU6m14dUhSilhEybzso78TrzX4ElHwPMm1svuDnea3YSqfek7OhytRtw rRoRLFsw2ReKP2WbUTvrv1u/jLvEDIeEWH0AOFgahYtKUxa7XjV5Eun4u57fPV3k+lwDNG KwG2DJ2X7GShWiZOgV4HE7pI0yvvo4yogXrQHUV7Ojcc9RVpc48SlPXHxZJ+LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712587615; a=rsa-sha256; cv=none; b=o9cJXUCuqVfUh3MUkouzdq/CLYFci54SWSoJh99Y3PvQMdtViGwEP9X5/tlKTt24yXbjoq KNL80FkIDiVSlKhR+Z1Wp2UuwnLQ/a0rJhDVhJk7SvDkCFySjJLPyTaM4uXjmw6TgmPkLO cITxPZPBLrpzzw3o/wBRjXd5xHjjl9uub8xXYNaNTVWZXtM7+mOivoDIntWNeCba1vqcGw 1XGrUM8CcRjOUdzXE1LSu1Ji2ran/PQgv531Ve3N5WeD3Z7Fc++vTk1j8F44ihJKxJxhzz TquGdvxzHr3JUMnoIqgauW9AZfZ7NyctJc0PzbKF8I2eDaNPc7HrFKIkQVl/gQ== 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=1712587615; 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=F/FYcYQWq8ToW7Zk5ySWJZewFmqFQUfs+jbj/qncQss=; b=cYsKQW0bJ1g+JDnQykC+BYqg+0UpxsePmbKsmdj2t09hbDk53QxkWCKYpUuWJANHM88gC9 /xTxrCsbEgd9EIamHMAOHfHwf9hezRd5bzkm0dldCqkQv2REHDmQvbR805efNuae85C4Qg CeT/xUkyQeOBtjETqBbcMRCv0R0G+K6eCxmaNb2ae9xnYSWfSU9c3ahsw39EtxcA4aDNAM NUIA0G4ZDd4jR/F4j8rrDP+/G7P7BXOTWsEORPK6JFHXPSHoUBKzoBnPV4pfwIPRAn8uqm t2UY2KGmDMLrLDYab7hMUd2R6YOG5v7i97aL9QvhF1BvGVeWpJyFhfkaklHq6w== 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 4VCsPB6l7CzFMd; Mon, 8 Apr 2024 14:46:54 +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 438Eksx6053437; Mon, 8 Apr 2024 14:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438EkstP053434; Mon, 8 Apr 2024 14:46:54 GMT (envelope-from git) Date: Mon, 8 Apr 2024 14:46:54 GMT Message-Id: <202404081446.438EkstP053434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 34791f4ac79e - main - capsicum.h: Include ktrace.h only in kernel 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: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34791f4ac79ee41f6986178a3a89d13f37ac156c Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=34791f4ac79ee41f6986178a3a89d13f37ac156c commit 34791f4ac79ee41f6986178a3a89d13f37ac156c Author: Jake Freeland AuthorDate: 2024-04-08 13:27:17 +0000 Commit: Jake Freeland CommitDate: 2024-04-08 14:32:58 +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 --- 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 e1113f590b85..5c6813d2a450 100644 --- a/sys/sys/capsicum.h +++ b/sys/sys/capsicum.h @@ -44,7 +44,6 @@ #include #include #include -#include #ifndef _KERNEL #include @@ -419,6 +418,7 @@ __END_DECLS #ifdef _KERNEL #include +#include #ifdef KTRACE #define CAP_TRACING(td) KTRPOINT((td), KTR_CAPFAIL)