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/octeon | |
| 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/octeon')
| -rw-r--r-- | sys/arch/octeon/octeon/mutex.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/sys/arch/octeon/octeon/mutex.c b/sys/arch/octeon/octeon/mutex.c index 4135e53139f..1d6ae9a7a6a 100644 --- a/sys/arch/octeon/octeon/mutex.c +++ b/sys/arch/octeon/octeon/mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.c,v 1.2 2010/09/28 20:27:55 miod Exp $ */ +/* $OpenBSD: mutex.c,v 1.3 2011/04/03 18:46:40 miod Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -70,19 +70,16 @@ mtx_enter(struct mutex *mtx) int s; int i = 10000000; for (;;) { - if (mtx->mtx_wantipl != IPL_NONE) - s = splraise(mtx->mtx_wantipl); + s = splraise(mtx->mtx_wantipl); if (try_lock(mtx)) { - if (mtx->mtx_wantipl != IPL_NONE) - mtx->mtx_oldipl = s; + mtx->mtx_oldipl = s; mtx->mtx_owner = curcpu(); #ifdef DIAGNOSTIC curcpu()->ci_mutex_level++; #endif return; } - if (mtx->mtx_wantipl != IPL_NONE) - splx(s); + splx(s); if(i-- <= 0) panic("mtx_enter timed out\n"); } @@ -93,19 +90,16 @@ mtx_enter_try(struct mutex *mtx) { int s; - if (mtx->mtx_wantipl != IPL_NONE) - s = splraise(mtx->mtx_wantipl); + s = splraise(mtx->mtx_wantipl); if (try_lock(mtx)) { - if (mtx->mtx_wantipl != IPL_NONE) - mtx->mtx_oldipl = s; + mtx->mtx_oldipl = s; mtx->mtx_owner = curcpu(); #ifdef DIAGNOSTIC curcpu()->ci_mutex_level++; #endif return 1; } - if (mtx->mtx_wantipl != IPL_NONE) - splx(s); + splx(s); return 0; } @@ -117,7 +111,6 @@ mtx_leave(struct mutex *mtx) curcpu()->ci_mutex_level--; #endif mtx->mtx_lock = 0; - if (mtx->mtx_wantipl != IPL_NONE) - splx(mtx->mtx_oldipl); + splx(mtx->mtx_oldipl); mtx->mtx_owner = NULL; } |