git: 5e941ac54da3 - main - powerpc: Move openpic_intr, since it's hidden now
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Oct 2025 03:01:45 UTC
The branch main has been updated by jhibbits:
URL: https://cgit.FreeBSD.org/src/commit/?id=5e941ac54da32a7eff2ff96a1744843e6e030518
commit 5e941ac54da32a7eff2ff96a1744843e6e030518
Author: Justin Hibbits <jhibbits@FreeBSD.org>
AuthorDate: 2025-10-30 03:00:09 +0000
Commit: Justin Hibbits <jhibbits@FreeBSD.org>
CommitDate: 2025-10-30 03:00:09 +0000
powerpc: Move openpic_intr, since it's hidden now
Last minute change by me (diff reduction), that I didn't build. This
was in the original commit.
Fixes: 8fb1789612 ("intr/powerpc: create openpic_class kobj")
MFC after: 2 weeks
X-MFC-with: 8fb1789612
---
sys/powerpc/powerpc/openpic.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
index e2de52638d79..aa28f63cb6f5 100644
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -280,17 +280,6 @@ openpic_config(device_t dev, u_int irq, enum intr_trigger trig,
openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x);
}
-static int
-openpic_intr(void *arg)
-{
- device_t dev = (device_t)(arg);
-
- /* XXX Cascaded PICs do not pass non-NULL trapframes! */
- openpic_dispatch(dev, NULL);
-
- return (FILTER_HANDLED);
-}
-
static void
openpic_dispatch(device_t dev, struct trapframe *tf)
{
@@ -311,6 +300,17 @@ openpic_dispatch(device_t dev, struct trapframe *tf)
}
}
+static int
+openpic_intr(void *arg)
+{
+ device_t dev = (device_t)(arg);
+
+ /* XXX Cascaded PICs do not pass non-NULL trapframes! */
+ openpic_dispatch(dev, NULL);
+
+ return (FILTER_HANDLED);
+}
+
void
openpic_enable(device_t dev, u_int irq, u_int vector, void **priv __unused)
{