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)

31 files changed, 41 insertions, 35 deletions

diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index d875ed53df3..786326551f1 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -603,7 +603,7 @@ ahaattach(parent, self, aux)
 	isa_establish(&aha->sc_id, &aha->sc_dev);
 #endif
 	aha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, ahaintr,
-	    aha);
+	    aha, aha->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index d875ed53df3..786326551f1 100644
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -603,7 +603,7 @@ ahaattach(parent, self, aux)
 	isa_establish(&aha->sc_id, &aha->sc_dev);
 #endif
 	aha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, ahaintr,
-	    aha);
+	    aha, aha->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aha284x.c b/sys/dev/isa/aha284x.c
index 91824287421..749f87840e0 100644
--- a/sys/dev/isa/aha284x.c
+++ b/sys/dev/isa/aha284x.c
@@ -180,7 +180,7 @@ ahe_attach(parent, self, aux)
         isa_establish(&ahc->sc_id, &ahc->sc_dev);
 #endif
         ahc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO,
-					ahcintr, ahc);
+					ahcintr, ahc, ahc->sc_dev.dv_xname);
 
 	/*
 	 * attach the devices on the bus
diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c
index e26f34f36e9..c159feff414 100644
--- a/sys/dev/isa/aic6360.c
+++ b/sys/dev/isa/aic6360.c
@@ -767,7 +767,7 @@ aicattach(parent, self, aux)
 	isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, aicintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 
 	config_found(self, &sc->sc_link, aicprint);
 }
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index 9676c79d298..79bc9c7dc57 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -140,7 +140,7 @@ astattach(parent, self, aux)
 	}
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, astintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index 350bde475ca..ca375bb6a14 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -135,7 +135,7 @@ bocaattach(parent, self, aux)
 	}
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, bocaintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c
index abb458924f4..ceccaee8a6b 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -613,7 +613,7 @@ btattach(parent, self, aux)
 	isa_establish(&bt->sc_id, &bt->sc_dev);
 #endif
 	bt->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, btintr,
-	    bt);
+	    bt, bt->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/bt742a.c b/sys/dev/isa/bt742a.c
index abb458924f4..ceccaee8a6b 100644
--- a/sys/dev/isa/bt742a.c
+++ b/sys/dev/isa/bt742a.c
@@ -613,7 +613,7 @@ btattach(parent, self, aux)
 	isa_establish(&bt->sc_id, &bt->sc_dev);
 #endif
 	bt->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, btintr,
-	    bt);
+	    bt, bt->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index c0003debb79..846d5f518f5 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -336,7 +336,7 @@ comattach(parent, self, aux)
 
 	if (ia->ia_irq != IRQUNK)
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
-		    comintr, sc);
+		    comintr, sc, sc->sc_dev.dv_xname);
 
 #ifdef KGDB
 	if (kgdb_dev == makedev(commajor, unit)) {
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 2f8e7ae732e..90ac3987c1d 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -308,7 +308,7 @@ fdcattach(parent, self, aux)
 	isa_establish(&fdc->sc_id, &fdc->sc_dev);
 #endif
 	fdc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, fdcintr,
-	    fdc);
+	    fdc, fdc->sc_dev.dv_xname);
 
 	/*
 	 * The NVRAM info only tells us about the first two disks on the
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index b43fd76c6dd..231d61e7dcc 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -914,7 +914,7 @@ gusattach(parent, self, aux)
 	 * we use IPL_CLOCK.
 	 */
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, gusintr,
-	    sc /* sc->sc_gusdsp */);
+	    sc /* sc->sc_gusdsp */, sc->sc_dev.dv_xname);
 
 	/*
 	 * Set some default values
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 06c0142a9ca..72898d40edd 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1263,7 +1263,7 @@ edattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, edintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 	sc->sc_sh = shutdownhook_establish((void (*)(void *))edstop, sc);
 }
 
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 50ee31aafa5..3ecd3de9390 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -413,7 +413,7 @@ egattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, egintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 void
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index d0064756bd2..b7313b4785b 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -206,7 +206,7 @@ elattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, elintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 
 	dprintf(("elattach() finished.\n"));
 }
diff --git a/sys/dev/isa/if_ep.c b/sys/dev/isa/if_ep.c
index 673e0938875..3748e4f0d18 100644
--- a/sys/dev/isa/if_ep.c
+++ b/sys/dev/isa/if_ep.c
@@ -567,7 +567,8 @@ epattach(parent, self, aux)
 					     PCI_COMMAND_STATUS_REG) |
 			       PCI_COMMAND_MASTER_ENABLE);
 
-		sc->sc_ih = pci_map_int(pa->pa_tag, IPL_NET, epintr, sc);
+		sc->sc_ih = pci_map_int(pa->pa_tag, IPL_NET, epintr, sc,
+					sc->sc_dev.dv_xname);
 		if (sc->sc_ih == NULL) {
 			printf("%s: couldn't map interrupt\n",
 			       sc->sc_dev.dv_xname);
@@ -580,7 +581,7 @@ epattach(parent, self, aux)
 	{
 		struct isa_attach_args *ia = aux;
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
-		    epintr, sc);
+		    epintr, sc, sc->sc_dev.dv_xname);
 	}
 }
 
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index 2a853fe9d36..6201923066a 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1125,7 +1125,7 @@ feattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index cb11e553270..fde8d97b909 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -777,7 +777,7 @@ ieattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, ieintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/if_le.c b/sys/dev/isa/if_le.c
index 1bb579ea1b3..3e5ca0ef005 100644
--- a/sys/dev/isa/if_le.c
+++ b/sys/dev/isa/if_le.c
@@ -398,7 +398,7 @@ leattach(parent, self, aux)
 			isa_dmacascade(ia->ia_drq);
 
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
-		    leintredge, sc);
+		    leintredge, sc, sc->sc_dev.dv_xname);
 	}
 #endif
 
@@ -410,7 +410,8 @@ leattach(parent, self, aux)
 		    pci_conf_read(pa->pa_tag, PCI_COMMAND_STATUS_REG) |
 		    PCI_COMMAND_MASTER_ENABLE);
 
-		sc->sc_ih = pci_map_int(pa->pa_tag, IPL_NET, leintr, sc);
+		sc->sc_ih = pci_map_int(pa->pa_tag, IPL_NET, leintr, sc,
+					sc->sc_dev.dv_xname);
 	}
 #endif
 
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 05b6b317c9a..77649082241 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -104,7 +104,7 @@ struct isa_softc {
 /* ISA interrupt sharing types */
 void	isascan __P((struct device *parent, void *match));
 void	*isa_intr_establish __P((int intr, int type, int level,
-	    int (*ih_fun)(void *), void *ih_arg));
+	    int (*ih_fun)(void *), void *ih_arg, char *ih_what));
 void	isa_intr_disestablish __P((void *handler));
 char	*isa_intr_typename __P((int type));
 
diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c
index ffe91a14127..8759f5e2e66 100644
--- a/sys/dev/isa/lpt.c
+++ b/sys/dev/isa/lpt.c
@@ -239,7 +239,7 @@ lptattach(parent, self, aux)
 
 	if (ia->ia_irq != IRQUNK)
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NONE,
-		    lptintr, sc);
+		    lptintr, sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 6c09efb68fb..ebec3cfd4aa 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -228,7 +228,7 @@ mcdattach(parent, self, aux)
 	mcd_soft_reset(sc);
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, mcdintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index b2e95400597..389bab91fb6 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -432,7 +432,8 @@ pasattach(parent, self, aux)
 	
 	sc->sc_iobase = iobase;
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO,
-				       sbdsp_intr, &sc->sc_sbdsp);
+				       sbdsp_intr, &sc->sc_sbdsp,
+				       sc->sc_dev.dv_xname);
 
 	printf(" ProAudio Spectrum %s [rev %d] ", pasnames[sc->model], sc->rev);
 	
diff --git a/sys/dev/isa/pcmcia_pcic.c b/sys/dev/isa/pcmcia_pcic.c
index 30e4d84707d..129eac5dd42 100644
--- a/sys/dev/isa/pcmcia_pcic.c
+++ b/sys/dev/isa/pcmcia_pcic.c
@@ -249,7 +249,8 @@ pcicattach(parent, self, aux)
 	    timeout((void (*)(void *))pcic_intr, pcic, pcic->sc_polltimo);
 	} else {
 	    pcic->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE,
-					     IPL_NET, pcic_intr, pcic);
+					     IPL_NET, pcic_intr, pcic,
+					     pcic->sc_dev.dv_xname);
 	    pcic->sc_polltimo = 0;
 	}
 }
diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c
index 0e90c4677fe..cd8eb338b36 100644
--- a/sys/dev/isa/pss.c
+++ b/sys/dev/isa/pss.c
@@ -1005,7 +1005,7 @@ pssattach(parent, self, aux)
 
     /* Setup interrupt handler for PSS */
     sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, pssintr,
-	sc);
+	sc, sc->sc_dev.dv_xname);
 
     vers = (inw(sc->sc_iobase+PSS_ID_VERS)&0xff) - 1;
     printf(": ESC614%c\n", (vers > 0)?'A'+vers:' ');
@@ -1040,7 +1040,7 @@ spattach(parent, self, aux)
 #endif
 
     sc->sc_ih = isa_intr_establish(cf->cf_irq, IST_EDGE, IPL_AUDIO, ad1848_intr,
-	sc);
+	sc, sc->sc_dev.dv_xname);
 
     /* XXX might use pssprint func ?? */
     printf(" port 0x%x-0x%x irq %d drq %d",
@@ -1068,7 +1068,7 @@ mpuattach(parent, self, aux)
 #endif
 
     sc->sc_ih = isa_intr_establish(cf->cf_irq, IST_EDGE, IPL_AUDIO, mpuintr,
-	sc);
+	sc, sc->sc_dev.dv_xname);
 
     /* XXX might use pssprint func ?? */
     printf(" port 0x%x-0x%x irq %d\n",
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index adfbe3579b5..311f04ccfeb 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -147,7 +147,8 @@ rtfpsattach(parent, self, aux)
 		}
 	}
 
-	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, rtfpsintr,	    sc);
+	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, rtfpsintr,
+				       sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 11ca1a4b9ed..561066e70a1 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -274,7 +274,7 @@ sbattach(parent, self, aux)
 	int err;
 	
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO,
-				       sbdsp_intr, sc);
+				       sbdsp_intr, sc, sc->sc_dev.dv_xname);
 
 	sbdsp_attach(sc);
 
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 4e2ef8990cc..57eb569f4d4 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -439,7 +439,7 @@ seaattach(parent, self, aux)
 	isa_establish(&sea->sc_id, &sea->sc_deV);
 #endif
 	sea->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, seaintr,
-	    sea);
+	    sea, sea->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index 834ecd2ee7a..74b2d644f8a 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -608,7 +608,7 @@ uhaattach(parent, self, aux)
 	isa_establish(&uha->sc_id, &uha->sc_dev);
 #endif
 	uha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO,
-	    uha->intr, uha);
+	    uha->intr, uha, uha->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index 96023380ae0..916e1b12a40 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -249,7 +249,7 @@ wdcattach(parent, self, aux)
 	printf("\n");
 
 	wdc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wdcintr,
-	    wdc);
+	    wdc, wdc->sc_dev.dv_xname);
 
 	for (wa.wa_drive = 0; wa.wa_drive < 2; wa.wa_drive++)
 		(void)config_found(self, (void *)&wa, wdprint);
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 2d5010e8769..3a277fcc3eb 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -249,7 +249,8 @@ wssattach(parent, self, aux)
 #ifdef NEWCONFIG
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
-    sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, ad1848_intr,	&sc->sc_ad1848);
+    sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, ad1848_intr,
+				   &sc->sc_ad1848, sc->sc_dev.dv_xname);
 
     ad1848_attach(&sc->sc_ad1848);
     
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index b714c74d4f2..1891be63584 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -250,7 +250,7 @@ wtattach(parent, self, aux)
 	sc->dens = -1;			/* unknown density */
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wtintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int