diff options
| -rw-r--r-- | sys/arch/hppa/dev/mongoose.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/gscbus.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/trap.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/hppa/dev/mongoose.c b/sys/arch/hppa/dev/mongoose.c index e2bd7a7fe16..055e1164f97 100644 --- a/sys/arch/hppa/dev/mongoose.c +++ b/sys/arch/hppa/dev/mongoose.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mongoose.c,v 1.7 2000/08/15 19:42:56 mickey Exp $ */ +/* $OpenBSD: mongoose.c,v 1.8 2002/02/05 04:26:06 mickey Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -335,7 +335,7 @@ mg_intr(void *v) int s, irq = 0; iv = &sc->sc_iv[irq]; - s = splx(iv->iv_pri); + s = splraise(iv->iv_pri); (iv->iv_handler)(iv->iv_arg); splx(s); diff --git a/sys/arch/hppa/gsc/gscbus.c b/sys/arch/hppa/gsc/gscbus.c index 258381bf402..cc7583f1834 100644 --- a/sys/arch/hppa/gsc/gscbus.c +++ b/sys/arch/hppa/gsc/gscbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gscbus.c,v 1.16 2001/12/02 04:03:57 mickey Exp $ */ +/* $OpenBSD: gscbus.c,v 1.17 2002/02/05 04:26:06 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -261,7 +261,7 @@ gsc_intr(v) printf("gsc_intr: calling %p for irq %d\n", v, i); #endif iv->evcnt.ev_count++; - s = splx(iv->pri); + s = splraise(iv->pri); ret = (iv->handler)(iv->arg); splx(s); #ifdef GSCDEBUG_INTR diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c index 4f8adec103e..d0d6701f71e 100644 --- a/sys/arch/hppa/hppa/trap.c +++ b/sys/arch/hppa/hppa/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.35 2002/02/02 03:07:46 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.36 2002/02/05 04:26:06 mickey Exp $ */ /* * Copyright (c) 1998-2001 Michael Shalayeff @@ -173,7 +173,7 @@ trap(type, frame) tts = trap_type[trapnum]; if (trapnum != T_INTERRUPT && trapnum != T_IBREAK) - db_printf("trap: %d, %s for %x:%x at %x:%x, fl=%x, fp=%p\n", + db_printf("trap: %x, %s for %x:%x at %x:%x, fl=%x, fp=%p\n", type, tts, space, va, frame->tf_iisq_head, frame->tf_iioq_head, frame->tf_flags, frame); else if (trapnum == T_IBREAK) @@ -586,7 +586,7 @@ cpu_intr(frame) register int s, r; iv->evcnt.ev_count++; - s = splx(iv->pri); + s = splraise(iv->pri); /* no arg means pass the frame */ r = (iv->handler)(iv->arg? iv->arg:frame); splx(s); |