Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 83e11f7260ff..f2ccb1620dc4 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1642,7 +1642,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);
 }
@@ -1656,7 +1656,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))