diff --git a/[refs] b/[refs] index ee599c13225f..75ccc3672b14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 458c096ed787b2572303a7087d23bfab06b450be +refs/heads/master: 6aed42159db1f99e83ccf17b1aa1a83bc75ac3e8 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 8fc2f84209e4..c519b439b8b1 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -2097,7 +2097,3 @@ EXPORT_SYMBOL(sock_wmalloc); EXPORT_SYMBOL(sock_i_uid); EXPORT_SYMBOL(sock_i_ino); EXPORT_SYMBOL(sysctl_optmem_max); -#ifdef CONFIG_SYSCTL -EXPORT_SYMBOL(sysctl_rmem_max); -EXPORT_SYMBOL(sysctl_wmem_max); -#endif