diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-05-14 17:32:18 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-05-14 17:32:18 +0000 |
| commit | 328d3d43526a4ed69a865bbc6ee159dbd81f6077 (patch) | |
| tree | a3ef8168a5b65a4f7bb1beb21d07ad64287b14eb /sys/arch/sgi | |
| parent | 5cad1f85ece3406c409a883cdee9aaff1a11bc2c (diff) | |
Oops, IPL_NONE is not zero in HEAD.
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/include/mutex.h | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/mutex.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sgi/include/mutex.h b/sys/arch/sgi/include/mutex.h index f3b0bd61b84..858d27c6a8f 100644 --- a/sys/arch/sgi/include/mutex.h +++ b/sys/arch/sgi/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.2 2007/05/05 12:06:20 miod Exp $ */ +/* $OpenBSD: mutex.h,v 1.3 2007/05/14 17:32:15 miod Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -39,7 +39,7 @@ struct mutex { void mtx_init(struct mutex *, int); -#define MUTEX_INITIALIZER(ipl) { 0, (ipl), 0 } +#define MUTEX_INITIALIZER(ipl) { 0, (ipl), IPL_NONE } #ifdef DIAGNOSTIC #define MUTEX_ASSERT_LOCKED(mtx) do { \ diff --git a/sys/arch/sgi/sgi/mutex.c b/sys/arch/sgi/sgi/mutex.c index bfaf0550d6a..52bed11efa9 100644 --- a/sys/arch/sgi/sgi/mutex.c +++ b/sys/arch/sgi/sgi/mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.c,v 1.1 2007/05/01 18:59:40 miod Exp $ */ +/* $OpenBSD: mutex.c,v 1.2 2007/05/14 17:32:17 miod Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -45,7 +45,7 @@ mtx_init(struct mutex *mtx, int wantipl) mtx->mtx_lock = 0; /* We can't access imask[] here, since MUTEX_INITIALIZER can't. */ mtx->mtx_wantipl = wantipl; - mtx->mtx_oldcpl = 0; + mtx->mtx_oldcpl = IPL_NONE; } void @@ -63,6 +63,6 @@ mtx_leave(struct mutex *mtx) { MUTEX_ASSERT_LOCKED(mtx); mtx->mtx_lock = 0; - if (mtx->mtx_wantipl != 0) + if (mtx->mtx_wantipl != IPL_NONE) splx(mtx->mtx_oldcpl); } |