diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:58:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:58:59 +0200 |
| commit | 41a66072c32978ff3914fd6be88f7592ef64bef7 (patch) | |
| tree | 0f38ef433f0feea3e58f61f8d5397cd9bf065559 /include/net/af_unix.h | |
| parent | Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into efi/core (diff) | |
| parent | Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into efi/urgent (diff) | |
| download | linux-dev-41a66072c32978ff3914fd6be88f7592ef64bef7.tar.xz linux-dev-41a66072c32978ff3914fd6be88f7592ef64bef7.zip | |
Merge branch 'efi/urgent' into efi/core, 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; |