diff options
| -rw-r--r-- | sys/arch/macppc/dev/macintr.c | 11 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/openpic.c | 11 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/intr.h | 4 |
3 files changed, 12 insertions, 14 deletions
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c index 025faeefc2f..5877af1480f 100644 --- a/sys/arch/macppc/dev/macintr.c +++ b/sys/arch/macppc/dev/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.8 2002/01/21 05:11:29 drahn Exp $ */ +/* $OpenBSD: macintr.c,v 1.9 2002/01/26 15:22:52 drahn Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -400,15 +400,14 @@ intr_calculatemasks() /* * There are tty, network and disk drivers that use free() at interrupt * time, so imp > (tty | net | bio). - */ - imask[IPL_IMP] |= imask[IPL_TTY] | imask[IPL_NET] | imask[IPL_BIO]; - - /* + * * Enforce a hierarchy that gives slow devices a better chance at not * dropping data. */ - imask[IPL_TTY] |= imask[IPL_NET] | imask[IPL_BIO]; imask[IPL_NET] |= imask[IPL_BIO]; + imask[IPL_TTY] |= imask[IPL_NET]; + imask[IPL_IMP] |= imask[IPL_TTY]; + imask[IPL_CLOCK] |= imask[IPL_IMP] | SPL_CLOCK; /* * These are pseudo-levels. diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c index 3e2f9ebd424..8738953ef25 100644 --- a/sys/arch/macppc/dev/openpic.c +++ b/sys/arch/macppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.9 2002/01/21 05:11:29 drahn Exp $ */ +/* $OpenBSD: openpic.c,v 1.10 2002/01/26 15:22:52 drahn Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -377,15 +377,14 @@ intr_calculatemasks() /* * There are tty, network and disk drivers that use free() at interrupt * time, so imp > (tty | net | bio). - */ - imask[IPL_IMP] |= imask[IPL_TTY] | imask[IPL_NET] | imask[IPL_BIO]; - - /* + * * Enforce a hierarchy that gives slow devices a better chance at not * dropping data. */ - imask[IPL_TTY] |= imask[IPL_NET] | imask[IPL_BIO]; imask[IPL_NET] |= imask[IPL_BIO]; + imask[IPL_TTY] |= imask[IPL_NET]; + imask[IPL_IMP] |= imask[IPL_TTY]; + imask[IPL_CLOCK] |= imask[IPL_IMP] | SPL_CLOCK; /* * These are pseudo-levels. diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index cf85f7476ea..4d498d48790 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.15 2002/01/21 17:20:22 drahn Exp $ */ +/* $OpenBSD: intr.h,v 1.16 2002/01/26 15:22:52 drahn Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -130,8 +130,8 @@ set_sint(int pending) #define splbio() splraise(imask[IPL_BIO]) #define splnet() splraise(imask[IPL_NET]) #define spltty() splraise(imask[IPL_TTY]) -#define splclock() splraise(SPL_CLOCK|SINT_MASK) #define splimp() splraise(imask[IPL_IMP]) +#define splclock() splraise(imask[IPL_CLOCK]) #define splvm() splraise(imask[IPL_IMP]) #define splstatclock() splhigh() #define spllowersoftclock() spllower(SINT_CLOCK) |