summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpirofti <pirofti@openbsd.org>2012-06-19 11:47:10 +0000
committerpirofti <pirofti@openbsd.org>2012-06-19 11:47:10 +0000
commitcacfe7285e65a02b4f95ed88e9123b6494badecf (patch)
tree59b0bed1f13760efab21e268f37d384a7c3ec1e1
parentSet the appropiate return value on futex wait. (diff)
downloadwireguard-openbsd-cacfe7285e65a02b4f95ed88e9123b6494badecf.tar.xz
wireguard-openbsd-cacfe7285e65a02b4f95ed88e9123b6494badecf.zip
Count should always start from zero.
Doesn't matter if we need to relocate or not. Makes sense to jasper@
-rw-r--r--sys/compat/linux/linux_futex.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index 510d6705a85..c8eb1cc8e2e 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_futex.c,v 1.8 2012/06/19 11:46:00 pirofti Exp $ */
+/* $OpenBSD: linux_futex.c,v 1.9 2012/06/19 11:47:10 pirofti Exp $ */
/* $NetBSD: linux_futex.c,v 1.26 2010/07/07 01:30:35 chs Exp $ */
/*-
@@ -522,13 +522,11 @@ int
futex_wake(struct futex *f, int n, struct futex *newf, int n2)
{
struct waiting_proc *wp;
- int count;
+ int count = 0;
KASSERT(newf != f);
MUTEX_ASSERT_LOCKED(&futex_lock);
- count = newf ? 0 : 1;
-
/*
* first, wake up any threads sleeping on this futex.
* note that sleeping threads are not in the process of requeueing.