diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-04-27 21:48:57 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-04-27 21:48:57 +0000 |
| commit | a7d060714187a42cfe95654af1263949edfa7786 (patch) | |
| tree | 8edfad0afb24ee7c5df9119e7494ddfd61cfce1f /sys/arch/hppa | |
| parent | 4bbb1bd85632378599d7d7af0ca2dc91b6728207 (diff) | |
Revert mtx_enter_try. It didn't compile on hppa, it doesn't compile on
landisk, and the sparc implementation is obviously wrong. That's where I
stopped looking, so who knows what else was broken. A simple comparison of
the existing mtx_enter with the new mtx_enter_try would have told anybody.
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/hppa/mutex.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/arch/hppa/hppa/mutex.c b/sys/arch/hppa/hppa/mutex.c index d23e51fbf8e..77c6cd782d2 100644 --- a/sys/arch/hppa/hppa/mutex.c +++ b/sys/arch/hppa/hppa/mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.c,v 1.3 2009/04/26 04:44:33 deraadt Exp $ */ +/* $OpenBSD: mutex.c,v 1.4 2009/04/27 21:48:56 kettenis Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -56,17 +56,6 @@ mtx_enter(struct mutex *mtx) mtx->mtx_lock = 1; } -int -mtx_enter_try(struct mutex *mtx) -{ - if (mtx->mtx_wantipl != IPL_NONE) - mtx->mtx_oldipl = splraise(mtx->mtx_wantipl); - MUTEX_ASSERT_UNLOCKED(mtx); - mtx->mtx_lock = 1; - - return 1; -} - void mtx_leave(struct mutex *mtx) { |