projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-sysfs', 'acpi-pci' and 'acpi-tables'
[cascardo/linux.git]
/
include
/
net
/
af_unix.h
diff --git
a/include/net/af_unix.h
b/include/net/af_unix.h
index
9b4c418
..
fd60ecc
100644
(file)
--- 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
rea
dlock;
+ struct mutex
iolock, bin
dlock;
struct sock *peer;
struct list_head link;
atomic_long_t inflight;