diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-07-14 18:22:09 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-07-14 18:22:09 +0000 |
| commit | 68757623058f380ed0fa2dfa7235e1ea8f513d11 (patch) | |
| tree | 90738fe602e69eba98274a00e0f8beeac7cb6545 /sys/arch/i386 | |
| parent | 33f82b104d3558d65a45f1cfd56068b9e084eb00 (diff) | |
IPL_VM is "mpsafe" now as well.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/include/mutex.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/isa/isa_machdep.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/include/mutex.h b/sys/arch/i386/include/mutex.h index b2fb16802bb..b4ae1145ed4 100644 --- a/sys/arch/i386/include/mutex.h +++ b/sys/arch/i386/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.5 2013/07/10 21:31:12 kettenis Exp $ */ +/* $OpenBSD: mutex.h,v 1.6 2013/07/14 18:22:07 kettenis Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -47,7 +47,7 @@ struct mutex { */ #ifdef MULTIPROCESSOR #define __MUTEX_IPL(ipl) \ - (((ipl) > IPL_NONE && (ipl) < IPL_VM) ? IPL_VM : (ipl)) + (((ipl) > IPL_NONE && (ipl) < IPL_TTY) ? IPL_TTY : (ipl)) #else #define __MUTEX_IPL(ipl) (ipl) #endif diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c index d596af6d7a6..7bf26bb9daa 100644 --- a/sys/arch/i386/isa/isa_machdep.c +++ b/sys/arch/i386/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.74 2013/07/10 21:31:12 kettenis Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.75 2013/07/14 18:22:08 kettenis Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ /*- @@ -501,7 +501,7 @@ isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level, flags = level & IPL_MPSAFE; level &= ~IPL_MPSAFE; - KASSERT(level <= IPL_VM || level >= IPL_CLOCK || flags & IPL_MPSAFE); + KASSERT(level <= IPL_TTY || level >= IPL_CLOCK || flags & IPL_MPSAFE); /* no point in sleeping unless someone can free memory. */ ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK); |