summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2015-02-11 01:10:48 +0000
committerdlg <dlg@openbsd.org>2015-02-11 01:10:48 +0000
commit7557d68e85a3e812d8e6bfef0d7cf2b3b4dfbe67 (patch)
tree190014ef819c54a0445de91f862ddd39c50e49f5
parentuse reallocarray; ok doug (diff)
downloadwireguard-openbsd-7557d68e85a3e812d8e6bfef0d7cf2b3b4dfbe67.tar.xz
wireguard-openbsd-7557d68e85a3e812d8e6bfef0d7cf2b3b4dfbe67.zip
slight knf, and __inline is really spelled inline.
-rw-r--r--sys/arch/alpha/alpha/lock_machdep.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/alpha/alpha/lock_machdep.c b/sys/arch/alpha/alpha/lock_machdep.c
index 2b449b15ac3..91be2bb6970 100644
--- a/sys/arch/alpha/alpha/lock_machdep.c
+++ b/sys/arch/alpha/alpha/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.1 2014/01/26 17:40:09 miod Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.2 2015/02/11 01:10:48 dlg Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -43,7 +43,7 @@ __mp_lock_init(struct __mp_lock *lock)
extern int __mp_lock_spinout;
#endif
-static __inline void
+static inline void
__mp_lock_spin(struct __mp_lock *mpl)
{
#ifndef MP_LOCKDEBUG
@@ -117,7 +117,6 @@ __mp_unlock(struct __mp_lock *mpl)
alpha_mb();
mpl->mpl_count = 0;
}
-
splx(s);
}
@@ -169,5 +168,5 @@ __mp_acquire_count(struct __mp_lock *mpl, int count)
int
__mp_lock_held(struct __mp_lock *mpl)
{
- return mpl->mpl_cpu == curcpu();
+ return (mpl->mpl_cpu == curcpu());
}