report unhandled interrupts w/ DEBUG only

2 files changed, 8 insertions, 16 deletions

diff --git a/sys/arch/hppa/gsc/gscbus.c b/sys/arch/hppa/gsc/gscbus.c
index 5affc2e37f3..87168df5712 100644
--- a/sys/arch/hppa/gsc/gscbus.c
+++ b/sys/arch/hppa/gsc/gscbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gscbus.c,v 1.7 1999/08/16 02:48:39 mickey Exp $	*/
+/*	$OpenBSD: gscbus.c,v 1.8 1999/08/16 04:05:38 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -253,10 +253,12 @@ gsc_intr(v)
 			s = splx(iv->pri);
 			ret = (iv->handler)(iv->arg);
 			splx(s);
+#ifdef DEBUG
 			if (!ret)
 				printf ("%s: can't handle interrupt\n",
 					iv->evcnt.ev_name);
-			ret++;
+#endif
+			ret = 1;
 		} else
 			printf("%s: stray interrupt %d\n",
 			       sc->sc_dev.dv_xname, i);
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index 4319b87f660..68981a9eeac 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.9 1999/08/16 03:22:58 mickey Exp $	*/
+/*	$OpenBSD: trap.c,v 1.10 1999/08/16 04:05:38 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -540,26 +540,16 @@ cpu_intr(frame)
 
 				iv->evcnt.ev_count++;
 				s = splx(iv->pri);
+				/* no arg means pass the frame */
 				r = (iv->handler)(iv->arg? iv->arg:frame);
 				splx(s);
-
-				/* no arg means pass the frame */
+#ifdef DEBUG
 				if (!r)
-#ifdef INTRDEBUG1
-					panic ("%s: can't handle interrupt",
-					       iv->evcnt.ev_name);
-#else
 					printf ("%s: can't handle interrupt\n",
 						iv->evcnt.ev_name);
 #endif
-				splx(s);
-			} else {
-#ifdef INTRDEBUG
-				panic  ("cpu_intr: stray interrupt %d", bit);
-#else
+			} else
 				printf ("cpu_intr: stray interrupt %d\n", bit);
-#endif
-			}
 		}
 	} while (eirr);
 }