Move C declarations from intreg.h to <machine/intr.h> which includes it.

This makes intreg.h locore-friendly - it only contains the MAXINTNUM define
after that.

ok claudio@ kettenis@

diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h
index c32e8e8..65fc494 100644 (file)
--- a/sys/arch/sparc64/include/intr.h
+++ b/sys/arch/sparc64/include/intr.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: intr.h,v 1.22 2018/08/20 15:02:07 visa Exp $  */
+/*     $OpenBSD: intr.h,v 1.23 2024/03/29 21:16:01 miod Exp $  */
 /*     $NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */
 
 /*-
@@ -110,4 +110,6 @@ void        *softintr_establish(int, void (*)(void *), void *);
 void    softintr_disestablish(void *);
 void    softintr_schedule(void *);
 
+void   send_softint(int cpu, int level, struct intrhand *ih);
+
 #endif /* _MACHINE_INTR_H_ */

diff --git a/sys/arch/sparc64/sparc64/intreg.h b/sys/arch/sparc64/sparc64/intreg.h
index 7c562c6..b09fb98 100644 (file)
--- a/sys/arch/sparc64/sparc64/intreg.h
+++ b/sys/arch/sparc64/sparc64/intreg.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: intreg.h,v 1.3 2003/06/02 23:27:56 millert Exp $      */
+/*     $OpenBSD: intreg.h,v 1.4 2024/03/29 21:16:01 miod Exp $ */
 /*     $NetBSD: intreg.h,v 1.4 2000/06/24 04:21:05 eeh Exp $ */
 
 /*
@@ -52,8 +52,3 @@
  *
  */
 #define MAXINTNUM      (1<<11)
-
-#ifndef _LOCORE
-struct intrhand;       /* This is in cpu.h if you need it. */
-void   send_softint(int cpu, int level, struct intrhand *ih);
-#endif