diff options
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 8ef8ba81b9e2..2b7a4b5c9b72 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -1142,7 +1142,7 @@ static int __sock_create(struct net *net, int family, int type, int protocol, | |||
1142 | 1142 | ||
1143 | sock->type = type; | 1143 | sock->type = type; |
1144 | 1144 | ||
1145 | #if defined(CONFIG_KMOD) | 1145 | #ifdef CONFIG_MODULES |
1146 | /* Attempt to load a protocol module if the find failed. | 1146 | /* Attempt to load a protocol module if the find failed. |
1147 | * | 1147 | * |
1148 | * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user | 1148 | * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user |
@@ -1511,6 +1511,7 @@ out_fd: | |||
1511 | goto out_put; | 1511 | goto out_put; |
1512 | } | 1512 | } |
1513 | 1513 | ||
1514 | #if 0 | ||
1514 | #ifdef HAVE_SET_RESTORE_SIGMASK | 1515 | #ifdef HAVE_SET_RESTORE_SIGMASK |
1515 | asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr, | 1516 | asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr, |
1516 | int __user *upeer_addrlen, | 1517 | int __user *upeer_addrlen, |
@@ -1564,6 +1565,7 @@ asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr, | |||
1564 | return do_accept(fd, upeer_sockaddr, upeer_addrlen, flags); | 1565 | return do_accept(fd, upeer_sockaddr, upeer_addrlen, flags); |
1565 | } | 1566 | } |
1566 | #endif | 1567 | #endif |
1568 | #endif | ||
1567 | 1569 | ||
1568 | asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, | 1570 | asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, |
1569 | int __user *upeer_addrlen) | 1571 | int __user *upeer_addrlen) |