diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-03-07 04:14:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-03-07 04:14:23 +0000 |
| commit | 8304ab40dc47b931293efe8727d776204ff895ff (patch) | |
| tree | 721901c22404e259179438ab54e8af2e5bb1effb /sys/arch/amd64 | |
| parent | 17fb1277989ca5240a1181633a3e88cb6febc341 (diff) | |
back out strict splassert semantics from 1.103; it breaks some things
like bigmem (disabled by default), sppp (ask wilfried about
"splassert: if_up/down: want 5 have 7")
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index e8815274bb1..f9edb8df3e3 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.103 2010/03/01 07:08:27 dlg Exp $ */ +/* $OpenBSD: machdep.c,v 1.104 2010/03/07 04:14:22 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1768,8 +1768,7 @@ splassert_check(int wantipl, const char *func) { int cpl = curcpu()->ci_ilevel; - if (cpl < wantipl || - (curcpu()->ci_idepth && cpl > wantipl)) { + if (cpl < wantipl) { splassert_fail(wantipl, cpl, func); } } |