From nobody Thu Oct 24 03:58:21 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 4XYsb21pXpz5b1kN; Thu, 24 Oct 2024 03:58:22 +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 4XYsb20DV8z4HsZ; Thu, 24 Oct 2024 03:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742302; 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=/+/UYRCbhUq3/8yxGfGRSjjmscA5+Ti8vbVFcflE+j4=; b=YUHgYhO0HZJNLJgHWBN1olxrvAt09cjRnq5zmifkrQjEa3W7a7rYnSujmmXfag/hxtWbV2 vGhhKasdjaElNSs+ZYW+na0CPjjEvzBAHWYYKRSxFjlCPjTKa2TMU1iJHcXbIp/nxP4wHZ ob4xYpypn+8rQzRMoNcfAhSTNBdF2YMKobacny5fxcPjV83wQDFCG3Yq1jVDw/w+iC96Sc tk2JUoTvDh0Kc09oSZVVMxRjGlAcunZVrlWdf0sl+cpmFiVXEVn2GtvBHu8NGfztVX2rIJ 7iJXmBoV/EwAR5Cp0vSNcOm6iFU35fn3DmTwe6nAWe0dx1fWiKvSiTW9EZD/Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742302; 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=/+/UYRCbhUq3/8yxGfGRSjjmscA5+Ti8vbVFcflE+j4=; b=gkvGa0byr1HiNvWLJ/g8zuzFuAejzsTnGKxC4C0o52cTqq/TPW4xuZbzz7k2DdWlvOtpbY 5Rx0biznKcU5o+/UnbWsoQMwq6sok2ackM4ZEh2UV6teafFqSeQaBF5bvoWzKEF5/tvViG gcz5hcpR2d66S/ixDY7j50VMB4K82ShbHrd7qdqkiytt2lrjGK5UsC3qBMMckUnAKiEla9 Pn1xNCVBMLuC1RaifKOCiDaxQQlyCAiQbIfjxMgVsUe+o1TNIIQKPF/Lvsi6Y7ZDntekvY XfPLsVXDRkYqCWTBEQahzT0Q9Nb5xZLXgK9LfjdWmPHiDEa7UdtHQ8ozN5IBAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729742302; a=rsa-sha256; cv=none; b=vEXJZ+ECHTR0vybPVJWQ+xahFcinme0JNEsXotwaeXuR2NNm2lSGlpHKDl8XbHUHYsoePe gO9tE5aldy7qx2bCTK3SDFdBnC5SaiukzN6jiuvi3tK0HAb2o5XTKa+wO1ClUUsirVdDm4 Py1lR3JgSnEvEqSOXcpYcd6VW9t+JjWxsweXaEpNvy/JaWqiU4MXMgkJS3s/xjtdbf4US0 fGxSCAnYX3drnxsRkzyPCWfrq2R2iGwXQPUd48PuawdY3EEmfFB32hClex9N6rHKtCwOdV yloNcby9V8aDzDq0KJ36wr8Lvi/lGixGKu3SjmPUscTi1SW9rtYmZJaiR7DG0Q== 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 4XYsb15852zR8t; Thu, 24 Oct 2024 03:58:21 +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 49O3wLlL018342; Thu, 24 Oct 2024 03:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O3wLa7018339; Thu, 24 Oct 2024 03:58:21 GMT (envelope-from git) Date: Thu, 24 Oct 2024 03:58:21 GMT Message-Id: <202410240358.49O3wLa7018339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 4f12b529f404 - main - sys/intr.h: formally depend on machine/intr.h 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f12b529f40422589404fc939ed4a92710412a61 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4f12b529f40422589404fc939ed4a92710412a61 commit 4f12b529f40422589404fc939ed4a92710412a61 Author: Kyle Evans AuthorDate: 2024-10-24 03:55:22 +0000 Commit: Kyle Evans CommitDate: 2024-10-24 03:55:29 +0000 sys/intr.h: formally depend on machine/intr.h sys/intr.h originally started life as an extract of arm's intr.h, and this include was dropped in its place. Changes in flight want to add some MD definitions that we'll use in the more MI parts of INTRNG. Let's formally reverse the dependency now since this is way more common in general. All of the includes switched in this change that I spot-checked were in-fact wanting declarations historically included in sys/intr.h anyways. Reviewed by: andrew, imp, jrtc27, mhorne, mmel, olce Differential Revision: https://reviews.freebsd.org/D47002 --- sys/arm/arm/mp_machdep.c | 2 +- sys/arm/include/intr.h | 2 -- sys/arm64/include/intr.h | 2 -- sys/kern/subr_intr.c | 2 +- sys/riscv/include/intr.h | 2 -- sys/riscv/riscv/mp_machdep.c | 2 +- sys/riscv/riscv/timer.c | 2 +- sys/riscv/riscv/trap.c | 4 ++-- sys/sys/intr.h | 2 ++ 9 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c index ce9a83042d4a..9a4dc4e503e1 100644 --- a/sys/arm/arm/mp_machdep.c +++ b/sys/arm/arm/mp_machdep.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #include #ifdef VFP #include diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index e74be3ac548e..32297f656392 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -53,8 +53,6 @@ enum root_type { #define NIRQ 1024 /* XXX - It should be an option. */ #endif -#include - void arm_irq_memory_barrier(uintptr_t); #endif /* _MACHINE_INTR_H */ diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h index 008c377b7a16..c3fe5edc8a6c 100644 --- a/sys/arm64/include/intr.h +++ b/sys/arm64/include/intr.h @@ -38,8 +38,6 @@ enum root_type { INTR_ROOT_COUNT /* MUST BE LAST */ }; -#include - #ifndef NIRQ #define NIRQ 16384 /* XXX - It should be an option. */ #endif diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 6b4ebd16675c..b8c085367dd6 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -72,7 +73,6 @@ #include #include -#include #include #include diff --git a/sys/riscv/include/intr.h b/sys/riscv/include/intr.h index 8cbb07c6be24..100f1ba40ff3 100644 --- a/sys/riscv/include/intr.h +++ b/sys/riscv/include/intr.h @@ -45,8 +45,6 @@ enum root_type { #define NIRQ 1024 #endif -#include - enum { IRQ_SOFTWARE_USER, IRQ_SOFTWARE_SUPERVISOR, diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c index 0e4d18ce47fb..235bee15ca29 100644 --- a/sys/riscv/riscv/mp_machdep.c +++ b/sys/riscv/riscv/mp_machdep.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,6 @@ #include #include -#include #include #include diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index 7ff8a84f3769..dc909082edae 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include #include -#include #include #include diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index 89eb6a1a378b..3bb1fc7f1010 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -37,11 +37,12 @@ #include #include +#include +#include #include #include #include #include -#include #include #include #include @@ -63,7 +64,6 @@ #include #include -#include #ifdef KDTRACE_HOOKS #include diff --git a/sys/sys/intr.h b/sys/sys/intr.h index 0208844e90c8..f612fc2744f1 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -35,6 +35,8 @@ #include +#include + #define INTR_IRQ_INVALID 0xFFFFFFFF enum intr_map_data_type {