better interrupt names for vmstat -iz; ok miod gwk

10 files changed, 26 insertions, 26 deletions

diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 557c8916935..f0ad5dc32b5 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.25 2007/04/10 17:47:54 miod Exp $	*/
+/*	$OpenBSD: adb.c,v 1.26 2007/04/22 22:31:14 deraadt Exp $	*/
 /*	$NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
@@ -1668,7 +1668,7 @@ adbattach(struct device *parent, struct device *self, void *aux)
 	adb_reinit();
 
 	mac_intr_establish(parent, ca->ca_intr[0], IST_LEVEL, IPL_HIGH,
-	    adb_intr, sc, "adb");
+	    adb_intr, sc, sc->sc_dev.dv_xname);
 
 	/* init powerpc globals which control RTC functionality */
 	time_read = adb_read_date_time;
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c
index 40fb3116a2d..c7eafabb261 100644
--- a/sys/arch/macppc/dev/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awacs.c,v 1.18 2005/11/17 02:58:03 brad Exp $	*/
+/*	$OpenBSD: awacs.c,v 1.19 2007/04/22 22:31:14 deraadt Exp $	*/
 /*	$NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $	*/
 
 /*-
@@ -300,11 +300,11 @@ awacs_attach(struct device *parent, struct device *self, void *aux)
 		cirq_type = oirq_type = iirq_type = IST_LEVEL;
 	}
 	mac_intr_establish(parent, cirq, cirq_type, IPL_AUDIO, awacs_intr,
-	    sc, "awacs");
+	    sc, sc->sc_dev.dv_xname);
 	mac_intr_establish(parent, oirq, oirq_type, IPL_AUDIO, awacs_tx_intr,
-	    sc, "awacs/tx");
+	    sc, sc->sc_dev.dv_xname);
 	mac_intr_establish(parent, iirq, iirq_type, IPL_AUDIO, awacs_rx_intr,
-	    sc, "awacs/rx");
+	    sc, sc->sc_dev.dv_xname);
 
 	printf(": irq %d,%d,%d",
 		cirq, oirq, iirq);
diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c
index 971033f9bb3..fe6dd4c00e3 100644
--- a/sys/arch/macppc/dev/esp.c
+++ b/sys/arch/macppc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.2 2006/12/31 21:10:37 gwk Exp $ */
+/* $OpenBSD: esp.c,v 1.3 2007/04/22 22:31:14 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -270,7 +270,7 @@ espattach(struct device *parent, struct device *self, void *aux)
 
 	/* and the interuppts */
 	mac_intr_establish(parent, esc->sc_intr, IST_LEVEL, IPL_BIO,
-	    ncr53c9x_intr, sc, "esp");
+	    ncr53c9x_intr, sc, sc->sc_dev.dv_xname);
 
 	/* Reset SCSI bus when halt. */
 	shutdownhook_establish(esp_shutdownhook, sc);
diff --git a/sys/arch/macppc/dev/i2s.c b/sys/arch/macppc/dev/i2s.c
index b1b466f2e9f..a4942db7abd 100644
--- a/sys/arch/macppc/dev/i2s.c
+++ b/sys/arch/macppc/dev/i2s.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i2s.c,v 1.7 2007/04/21 15:43:27 gwk Exp $	*/
+/*	$OpenBSD: i2s.c,v 1.8 2007/04/22 22:31:14 deraadt Exp $	*/
 /*	$NetBSD: i2s.c,v 1.1 2003/12/27 02:19:34 grant Exp $	*/
 
 /*-
@@ -138,7 +138,7 @@ i2s_attach(struct device *parent, struct i2s_softc *sc, struct confargs *ca)
 
 	/* intr_establish(cirq, cirq_type, IPL_AUDIO, i2s_intr, sc); */
 	mac_intr_establish(parent, oirq, oirq_type, IPL_AUDIO, i2s_intr,
-	    sc, "i2s");
+	    sc, sc->sc_dev.dv_xname);
 	/* intr_establish(iirq, iirq_type, IPL_AUDIO, i2s_intr, sc); */
 
 	printf(": irq %d,%d,%d\n", cirq, oirq, iirq);
@@ -1164,11 +1164,11 @@ i2s_gpio_init(sc, node, parent)
 
 	if (headphone_detect_intr != -1)
 		mac_intr_establish(parent, headphone_detect_intr, IST_EDGE,
-		    IPL_AUDIO, i2s_cint, sc, "i2s_h");
+		    IPL_AUDIO, i2s_cint, sc, sc->sc_dev.dv_xname);
 
 	if (lineout_detect_intr != -1)
 		mac_intr_establish(parent, lineout_detect_intr, IST_EDGE,
-		    IPL_AUDIO, i2s_cint, sc, "i2s_l");
+		    IPL_AUDIO, i2s_cint, sc, sc->sc_dev.dv_xname);
 
 	/* Enable headphone interrupt? */
 	*headphone_detect |= 0x80;
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index ded85e08d40..67cf62e873c 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bm.c,v 1.21 2006/03/25 22:41:41 djm Exp $	*/
+/*	$OpenBSD: if_bm.c,v 1.22 2007/04/22 22:31:14 deraadt Exp $	*/
 /*	$NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $	*/
 
 /*-
@@ -260,9 +260,9 @@ bmac_attach(struct device *parent, struct device *self, void *aux)
 		ether_sprintf(laddr));
 
 	mac_intr_establish(parent, ca->ca_intr[0], IST_LEVEL, IPL_NET,
-	    bmac_intr, sc, "bmac intr");
+	    bmac_intr, sc, sc->sc_dev.dv_xname);
 	mac_intr_establish(parent, ca->ca_intr[2], IST_LEVEL, IPL_NET,
-	    bmac_rint, sc, "bmac rint");
+	    bmac_rint, sc, sc->sc_dev.dv_xname);
 
 	bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
 	ifp->if_softc = sc;
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 51bbf9727eb..54e89adbb0f 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.9 2007/04/02 21:46:30 kettenis Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.10 2007/04/22 22:31:14 deraadt Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $	*/
 
 /*-
@@ -440,9 +440,9 @@ mc_attach(struct device *parent, struct device *self, void *aux)
 
 	/* install interrupt handlers */
 	mac_intr_establish(parent, ca->ca_intr[2], IST_LEVEL, IPL_NET,
-	    mc_dmaintr, sc, "mace");
+	    mc_dmaintr, sc, sc->sc_dev.dv_xname);
 	mac_intr_establish(parent, ca->ca_intr[0],  IST_LEVEL, IPL_NET,
-	    mc_intr, sc, "mace");
+	    mc_intr, sc, sc->sc_dev.dv_xname);
 
 	sc->sc_biucc = XMTSP_64;
 	sc->sc_fifocc = XMTFW_16 | RCVFW_64 | XMTFWU | RCVFWU |
diff --git a/sys/arch/macppc/dev/macgpio.c b/sys/arch/macppc/dev/macgpio.c
index b8124fee280..09f3c740eb1 100644
--- a/sys/arch/macppc/dev/macgpio.c
+++ b/sys/arch/macppc/dev/macgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macgpio.c,v 1.5 2006/06/19 22:42:33 miod Exp $	*/
+/*	$OpenBSD: macgpio.c,v 1.6 2007/04/22 22:31:14 deraadt Exp $	*/
 /*	$NetBSD: gpio.c,v 1.2 2001/02/27 05:16:33 matt Exp $	*/
 
 /*-
@@ -162,7 +162,7 @@ macgpio_gpio_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_port = ((struct gpio_softc *) parent)->sc_port;
 	mac_intr_establish(parent, ca->ca_intr[0], IST_LEVEL, IPL_HIGH,
-	    gpio_intr, sc, "gpio/adb");
+	    gpio_intr, sc, sc->sc_dev.dv_xname);
 
 	printf(" irq %d\n", ca->ca_intr[0]);
 }
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index 5c58e0fe92a..9996a6476a3 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mesh.c,v 1.17 2007/04/02 21:46:30 kettenis Exp $	*/
+/*	$OpenBSD: mesh.c,v 1.18 2007/04/22 22:31:14 deraadt Exp $	*/
 /*	$NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $	*/
 
 /*-
@@ -365,7 +365,7 @@ mesh_attach(struct device *parent, struct device *self, void *aux)
 	config_found(&sc->sc_dev, &saa, scsiprint);
 
 	mac_intr_establish(parent, sc->sc_irq, IST_LEVEL, IPL_BIO, mesh_intr,
-	    sc, "mesh");
+	    sc, sc->sc_dev.dv_xname);
 
 	/* Reset SCSI bus when halt. */
 	shutdownhook_establish(mesh_shutdownhook, sc);
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index 3b788409152..f4ae059b1a6 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openpic.c,v 1.37 2007/03/20 20:59:53 kettenis Exp $	*/
+/*	$OpenBSD: openpic.c,v 1.38 2007/04/22 22:31:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -169,7 +169,7 @@ openpic_attach(struct device *parent, struct device  *self, void *aux)
 
 #if 1
 	mac_intr_establish(parent, 0x37, IST_LEVEL,
-		IPL_HIGH, openpic_prog_button, (void *)0x37, "prog button");
+		IPL_HIGH, openpic_prog_button, (void *)0x37, "progbutton");
 #endif
 	ppc_intr_enable(1);
 
diff --git a/sys/arch/macppc/dev/smu.c b/sys/arch/macppc/dev/smu.c
index 87c6a481be2..dfec142a89d 100644
--- a/sys/arch/macppc/dev/smu.c
+++ b/sys/arch/macppc/dev/smu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smu.c,v 1.17 2007/03/22 16:55:31 deraadt Exp $	*/
+/*	$OpenBSD: smu.c,v 1.18 2007/04/22 22:31:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -246,7 +246,7 @@ smu_attach(struct device *parent, struct device *self, void *aux)
 
 	/* Establish smu-doorbell interrupt. */
 	mac_intr_establish(parent, intr, IST_EDGE, IPL_BIO,
-	    smu_intr, sc, "smu");
+	    smu_intr, sc, sc->sc_dev.dv_xname);
 
 	/* Initialize global variables that control RTC functionality. */
 	time_read = smu_time_read;