diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-09-21 01:04:13 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-09-21 01:04:13 +0000 |
| commit | 65b08c35499d535104c74dd706b95a43b99913f1 (patch) | |
| tree | 958546e208149ffa0d2e28258a47c3fc27c9160d | |
| parent | 0258cf85e8163b603a141e2ad6aba2679d754637 (diff) | |
Make splassert(IPL_NONE) work on amd64 the same as it does on i386.
ok oga@ (a while back)
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index c68a2b31c97..44151713bcc 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.119 2010/08/05 21:10:10 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.120 2010/09/21 01:04:12 matthew Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1776,6 +1776,10 @@ splassert_check(int wantipl, const char *func) if (cpl < wantipl) { splassert_fail(wantipl, cpl, func); } + + if (wantipl == IPL_NONE && curcpu()->ci_idepth != 0) { + splassert_fail(-1, curcpu()->ci_idepth, func); + } } #endif |