Pass device name to interrupt establish routines so it can be recorded in

the device interrupt chain structures (isa, pci)

Move interrupt chain structure definition to <machine/psl.h> so vmstat can
get at it (i386)

Remove hack to count interrupts the old way (i386)

1 files changed, 15 insertions, 0 deletions

diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h
index 3d527e12be5..504708dfe52 100644
--- a/sys/arch/i386/include/psl.h
+++ b/sys/arch/i386/include/psl.h
@@ -99,6 +99,21 @@
 
 #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)();
+	void	*ih_arg;
+	u_long	ih_count;
+	struct	intrhand *ih_next;
+	int	ih_level;
+	int	ih_irq;
+	char	*ih_what;
+};
+
 volatile int cpl, ipending, astpending;
 int imask[5];