diff --git a/[refs] b/[refs] index b4b5cb77bd06..f494422b6f90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28a7b327b8cc8ea35662d360d3d11d60195debc9 +refs/heads/master: 7a42c2175703f54a3640f25dc078c8190a4f904e diff --git a/trunk/net/socket.c b/trunk/net/socket.c index d6f27ed9ba6c..1bc4167e0da8 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -1337,7 +1337,7 @@ asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen) * ready for listening. */ -int sysctl_somaxconn = SOMAXCONN; +int sysctl_somaxconn __read_mostly = SOMAXCONN; asmlinkage long sys_listen(int fd, int backlog) {