intrcompat: move pic_base_class declaration to sys/interrupt.h

As all FreeBSD architectures provide a PIC base class, move the declaration to the common header.
freebsd · Dec 23, 2024 · 0aca61c · 0aca61c
1 parent ba63dfe
commit 0aca61c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/sys/powerpc/include/interrupt.h b/sys/powerpc/include/interrupt.h
@@ -30,14 +30,10 @@
 
 /* FreeBSD standard interrupt controller interface */
 
-#include <sys/kobj.h>
-
 typedef struct powerpc_intr interrupt_t;
 
 #include <sys/interrupt.h>
 
-DECLARE_CLASS(pic_base_class);
-
 /* FreeBSD standard interrupt controller interface */
 
 #define	INTR_VECTORS	256

diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
@@ -36,12 +36,20 @@
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 #include <sys/ck.h>
+#include <sys/kobj.h>
 #include <sys/types.h>
 
 struct intr_event;
 struct intr_thread;
 struct trapframe;
 
+/*
+ * Common base class for PICs.  All FreeBSD architectures provide this,
+ * so present in this header.
+ */
+
+DECLARE_CLASS(pic_base_class);
+
 /*
  * Describe a hardware interrupt handler.
  *

diff --git a/sys/sys/intr.h b/sys/sys/intr.h
@@ -39,14 +39,10 @@
 
 /* FreeBSD standard interrupt controller interface */
 
-#include <sys/kobj.h>
-
 typedef struct intr_irqsrc interrupt_t;
 
 #include <sys/interrupt.h>
 
-DECLARE_CLASS(pic_base_class);
-
 /* FreeBSD standard interrupt controller interface */
 
 #define	INTR_IRQ_INVALID	0xFFFFFFFF

diff --git a/sys/x86/include/interrupt.h b/sys/x86/include/interrupt.h
@@ -32,14 +32,10 @@
 
 /* FreeBSD standard interrupt controller interface */
 
-#include <sys/kobj.h>
-
 typedef struct intsrc interrupt_t;
 
 #include <sys/interrupt.h>
 
-DECLARE_CLASS(pic_base_class);
-
 /* FreeBSD standard interrupt controller interface */
 
 typedef struct { device_t next, prev; } pic_base_softc_t;