Fix back wrong patches.

9 files changed, 11 insertions, 8 deletions

diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index c4e310a032f..4c170d56137 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -328,7 +328,7 @@ cpu_initclocks()
 	 * XXX If you're doing strange things with multiple clocks, you might
 	 * want to keep track of clock handlers.
 	 */
-	(void)isa_intr_establish(0, IST_PULSE, IPL_CLOCK, clockintr, 0);
+	(void)isa_intr_establish(0, IST_PULSE, IPL_CLOCK, clockintr, 0, "clock");
 }
 
 void
diff --git a/sys/arch/i386/isa/fd.c b/sys/arch/i386/isa/fd.c
index abd878fcc6b..91ab422a591 100644
--- a/sys/arch/i386/isa/fd.c
+++ b/sys/arch/i386/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/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 93f22d78a73..044e9478acf 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -249,12 +249,13 @@ fakeintr(arg)
  * XXX PRONE TO RACE CONDITIONS, UGLY, 'INTERESTING' INSERTION ALGORITHM.
  */
 void *
-isa_intr_establish(irq, type, level, ih_fun, ih_arg)
+isa_intr_establish(irq, type, level, ih_fun, ih_arg, ih_what)
 	int irq;
 	int type;
 	int level;
 	int (*ih_fun) __P((void *));
 	void *ih_arg;
+	char *ih_what;
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {fakeintr};
@@ -308,6 +309,7 @@ isa_intr_establish(irq, type, level, ih_fun, ih_arg)
 	ih->ih_next = NULL;
 	ih->ih_level = level;
 	ih->ih_irq = irq;
+	ih->ih_what = ih_what;
 	*p = ih;
 
 	return (ih);
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 495653d9b65..76d4f7770fa 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -89,6 +89,7 @@ struct intrhand {
 	struct	intrhand *ih_next;
 	int	ih_level;
 	int	ih_irq;
+	char	*ih_what;
 };
 
  
diff --git a/sys/arch/i386/isa/lms.c b/sys/arch/i386/isa/lms.c
index 7c453919051..64fade8f35b 100644
--- a/sys/arch/i386/isa/lms.c
+++ b/sys/arch/i386/isa/lms.c
@@ -120,7 +120,7 @@ lmsattach(parent, self, aux)
 	sc->sc_state = 0;
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_PULSE, IPL_TTY, lmsintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/arch/i386/isa/mms.c b/sys/arch/i386/isa/mms.c
index ae4f144e726..aa32db40e1c 100644
--- a/sys/arch/i386/isa/mms.c
+++ b/sys/arch/i386/isa/mms.c
@@ -110,7 +110,7 @@ mmsattach(parent, self, aux)
 	sc->sc_state = 0;
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_PULSE, IPL_TTY, mmsintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index 3ec32a58889..46d7f3476f8 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -326,7 +326,7 @@ npxattach(parent, self, aux)
 		printf("\n");
 		lcr0(rcr0() & ~CR0_NE);
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NONE,
-		    npxintr, 0);
+		    npxintr, 0, sc->sc_dev.dv_xname);
 		break;
 	case NPX_EXCEPTION:
 		printf(": using exception 16\n");
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index fefe23887d3..cc952ed2adf 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -471,7 +471,7 @@ pcattach(parent, self, aux)
 	do_async_update(1);
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, pcintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/arch/i386/isa/pms.c b/sys/arch/i386/isa/pms.c
index 882b1a7951b..11e89cd9e61 100644
--- a/sys/arch/i386/isa/pms.c
+++ b/sys/arch/i386/isa/pms.c
@@ -193,7 +193,7 @@ pmsattach(parent, self, aux)
 	sc->sc_state = 0;
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, pmsintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int