Move struct intrhand to <machine/psl.h> [again] so user-level programs can

get at it.

2 files changed, 19 insertions, 16 deletions

diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h
index 3da8dfdd728..e1dc71ec94f 100644
--- a/sys/arch/i386/include/psl.h
+++ b/sys/arch/i386/include/psl.h
@@ -76,4 +76,23 @@
 #include <machine/intr.h>
 #endif
 
+#ifndef _LOCORE
+
+/*
+ * Interrupt handler chains.  isa_intr_establish() inserts a handler into
+ * the list.  The handler is called with its (single) argument.
+ */
+
+struct intrhand {
+	int	(*ih_fun) __P((void *));
+	void	*ih_arg;
+	u_long	ih_count;
+	struct	intrhand *ih_next;
+	int	ih_level;
+	int	ih_irq;
+	char	*ih_what;
+};
+
+#endif /* _LOCORE */
+ 
 #endif /* !_I386_PSL_H_ */
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 6476195efb7..f34aca68bae 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -106,22 +106,6 @@ void	isa_intr_disestablish __P((isa_chipset_tag_t ic, void *handler));
 
 
 /*
- * Interrupt handler chains.  isa_intr_establish() inserts a handler into
- * the list.  The handler is called with its (single) argument.
- */
-
-struct intrhand {
-	int	(*ih_fun) __P((void *));
-	void	*ih_arg;
-	u_long	ih_count;
-	struct	intrhand *ih_next;
-	int	ih_level;
-	int	ih_irq;
-	char	*ih_what;
-};
-
- 
-/*
  * ISA DMA bounce buffers.
  * XXX should be made partially machine- and bus-mapping-independent.
  *