diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:51:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:51:37 +1000 |
| commit | 4532403b5fb3a5cea96ba31db5309506c203924d (patch) | |
| tree | 53c0234469d74e3043b1af97701e23078a0905e8 /net/unix | |
| parent | d61443cb3396ee18856baca4658db54900b9c0b0 (diff) | |
| parent | aec36eaab6009517a7ded2009cdba3508106d4f2 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/arm64/include/asm/thread_info.h
arch/arm64/mm/mmu.c
drivers/block/mtip32xx/mtip32xx.c
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 7b9114e0a5b..e9688438073 100644 --- 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); |