diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-21 15:01:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-21 15:01:57 +0200 |
| commit | 580498a23be1de55be55147eaee20a69249aeb13 (patch) | |
| tree | 345f1a280812bf15969ae7097583b7dd59482636 /include/net/af_unix.h | |
| parent | 3ec979658e5cc0fab86a42af79a650299e4d7135 (diff) | |
| parent | 7d1e042314619115153a0f6f06e4552c09a50e13 (diff) | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 9b4c418bebd8..fd60eccb59a6 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -52,7 +52,7 @@ struct unix_sock { struct sock sk; struct unix_address *addr; struct path path; - struct mutex readlock; + struct mutex iolock, bindlock; struct sock *peer; struct list_head link; atomic_long_t inflight; |