Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 7b9114e0a5b14949e11f312e34a8b5b26c5a5a39..e968843807320ea66a8b6421974fa182ab9d58aa 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1207,7 +1207,7 @@ restart:
        sk->sk_state    = TCP_ESTABLISHED;
        sock_hold(newsk);
 
-       smp_mb__after_atomic_inc();     /* sock_hold() does an atomic_inc() */
+       smp_mb__after_atomic(); /* sock_hold() does an atomic_inc() */
        unix_peer(sk)   = newsk;
 
        unix_state_unlock(sk);