projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'kumar/merge' into merge
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index e56162cd65b053b7a86119737dd7ca91329573d7..28a96af484b421ee06fffbe87358c1811693c97f 100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-2492,7
+2492,7
@@
int sock_register(const struct net_proto_family *ops)
lockdep_is_held(&net_family_lock)))
err = -EEXIST;
else {
-
RCU_INIT_POINTER
(net_families[ops->family], ops);
+
rcu_assign_pointer
(net_families[ops->family], ops);
err = 0;
}
spin_unlock(&net_family_lock);