summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2013-05-01 17:18:55 +0000
committertedu <tedu@openbsd.org>2013-05-01 17:18:55 +0000
commit0c9b2c0b2b14e06e9f7fede867d616c9ee1b2763 (patch)
tree1ab3cf1dc166a9c39fb2fd708f0105e8e93852bb
parentexorcise lockmgr. the api remains, but is now backed by recursive rwlocks. (diff)
downloadwireguard-openbsd-0c9b2c0b2b14e06e9f7fede867d616c9ee1b2763.tar.xz
wireguard-openbsd-0c9b2c0b2b14e06e9f7fede867d616c9ee1b2763.zip
a few tweaks noticed by jsing
-rw-r--r--sys/kern/kern_lock.c4
-rw-r--r--sys/kern/kern_rwlock.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 9593ac5b276..77a883c1c8f 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_lock.c,v 1.40 2013/05/01 17:13:05 tedu Exp $ */
+/* $OpenBSD: kern_lock.c,v 1.41 2013/05/01 17:18:55 tedu Exp $ */
/*
* Copyright (c) 1995
@@ -42,7 +42,7 @@
#include <sys/sched.h>
#ifdef MP_LOCKDEBUG
-/* CPU-dependent timing, needs this to be settable from ddb. */
+/* CPU-dependent timing, this needs to be settable from ddb. */
int __mp_lock_spinout = 200000000;
#endif
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index d417012bc1f..596f302308b 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_rwlock.c,v 1.18 2013/05/01 17:13:05 tedu Exp $ */
+/* $OpenBSD: kern_rwlock.c,v 1.19 2013/05/01 17:18:55 tedu Exp $ */
/*
* Copyright (c) 2002, 2003 Artur Grabowski <art@openbsd.org>
@@ -256,7 +256,6 @@ rw_exit(struct rwlock *rwl)
int
rw_status(struct rwlock *rwl)
{
-
return (rwl->rwl_owner != 0L);
}
@@ -334,6 +333,5 @@ rrw_exit(struct rrwlock *rrwl)
int
rrw_status(struct rrwlock *rrwl)
{
-
return (rw_status(&rrwl->rrwl_lock));
}