diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-03 18:46:42 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-03 18:46:42 +0000 |
| commit | a6353483b94ab2a137a9b22b497213fb3e42d30f (patch) | |
| tree | 7f03af461756562fa42aa96c4f5185b07ccb089d /sys/arch/sh | |
| parent | 42cad736a05d3379f03bc81bc9d230c7b04b4d7a (diff) | |
Remove the `skip splraise/splx for IPL_NONE mutexes' optimizations. It is not
always gaining anything, and msleep() implementation depends upon mtx_leave()
invoking splx().
Diffstat (limited to 'sys/arch/sh')
| -rw-r--r-- | sys/arch/sh/sh/mutex.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/sh/sh/mutex.c b/sys/arch/sh/sh/mutex.c index c862cb77989..432bcd0a4cf 100644 --- a/sys/arch/sh/sh/mutex.c +++ b/sys/arch/sh/sh/mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.c,v 1.5 2010/09/28 20:27:55 miod Exp $ */ +/* $OpenBSD: mutex.c,v 1.6 2011/04/03 18:46:40 miod Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -50,8 +50,7 @@ mtx_init(struct mutex *mtx, int wantipl) void mtx_enter(struct mutex *mtx) { - if (mtx->mtx_wantipl != IPL_NONE << 4) - mtx->mtx_oldipl = _cpu_intr_raise(mtx->mtx_wantipl); + mtx->mtx_oldipl = _cpu_intr_raise(mtx->mtx_wantipl); MUTEX_ASSERT_UNLOCKED(mtx); mtx->mtx_lock = 1; @@ -63,8 +62,7 @@ mtx_enter(struct mutex *mtx) int mtx_enter_try(struct mutex *mtx) { - if (mtx->mtx_wantipl != IPL_NONE) - mtx->mtx_oldipl = _cpu_intr_raise(mtx->mtx_wantipl); + mtx->mtx_oldipl = _cpu_intr_raise(mtx->mtx_wantipl); MUTEX_ASSERT_UNLOCKED(mtx); mtx->mtx_lock = 1; #ifdef DIAGNOSTIC @@ -82,6 +80,5 @@ mtx_leave(struct mutex *mtx) curcpu()->ci_mutex_level--; #endif mtx->mtx_lock = 0; - if (mtx->mtx_wantipl != IPL_NONE << 4) - _cpu_intr_resume(mtx->mtx_oldipl); + _cpu_intr_resume(mtx->mtx_oldipl); } |