diff options
| author |   mpi <mpi@openbsd.org> | 2020-12-28 14:23:30 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2020-12-28 14:23:30 +0000 |
| commit | 0f37d69638ce206d023c79a45b0c3f0777fba104 (patch) | |
| tree | b5ea76928f275755c45c9a983df5a76e46f1d378 | |
| parent | Initialize pmap_kernel()'s mutexes. (diff) | |
| download | wireguard-openbsd-0f37d69638ce206d023c79a45b0c3f0777fba104.tar.xz wireguard-openbsd-0f37d69638ce206d023c79a45b0c3f0777fba104.zip | |
Sync with i386 by asserting that IPL values should be at least IPL_NONE.
| -rw-r--r-- | sys/arch/amd64/amd64/intr.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/intr.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c index ef761f0ce69..a3331810a6a 100644 --- a/sys/arch/amd64/amd64/intr.c +++ b/sys/arch/amd64/amd64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.54 2020/06/17 06:14:52 dlg Exp $ */ +/* $OpenBSD: intr.c,v 1.55 2020/12/28 14:23:30 mpi Exp $ */ /* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */ /* @@ -696,6 +696,8 @@ splraise(int nlevel) int olevel; struct cpu_info *ci = curcpu(); + KASSERT(nlevel >= IPL_NONE); + olevel = ci->ci_ilevel; ci->ci_ilevel = MAX(ci->ci_ilevel, nlevel); return (olevel); diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c index 45abf2f94b7..d2bb078b361 100644 --- a/sys/arch/sparc64/sparc64/intr.c +++ b/sys/arch/sparc64/sparc64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.61 2020/06/24 22:03:40 cheloha Exp $ */ +/* $OpenBSD: intr.c,v 1.62 2020/12/28 14:23:30 mpi Exp $ */ /* $NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */ /* @@ -322,6 +322,7 @@ intr_establish(int level, struct intrhand *ih) int splraise(int ipl) { + KASSERT(ipl >= IPL_NONE); return (_splraise(ipl)); } |