From e24cf6f7f70b01c79ded7046e50df3e16edb298c Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 19 Mar 2008 01:44:24 +0100 Subject: [PATCH] --- yaml --- r: 87477 b: refs/heads/master c: 6f3d09291b4982991680b61763b2541e53e2a95f h: refs/heads/master i: 87475: 6314105fa25f676079a1aab8de45559f0cf52064 v: v3 --- [refs] | 2 +- trunk/net/core/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3a4ddf4f4446..f4443f7c0075 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f48273860edfca2306236d0f0de609aab3f773d4 +refs/heads/master: 6f3d09291b4982991680b61763b2541e53e2a95f diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 09cb3a74de7f..2654c147c004 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -1621,7 +1621,7 @@ static void sock_def_readable(struct sock *sk, int len) { read_lock(&sk->sk_callback_lock); if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) - wake_up_interruptible(sk->sk_sleep); + wake_up_interruptible_sync(sk->sk_sleep); sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN); read_unlock(&sk->sk_callback_lock); } @@ -1635,7 +1635,7 @@ static void sock_def_write_space(struct sock *sk) */ if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf) { if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) - wake_up_interruptible(sk->sk_sleep); + wake_up_interruptible_sync(sk->sk_sleep); /* Should agree with poll, otherwise some programs break */ if (sock_writeable(sk))