diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
| commit | 0d62950125241a6e6db8e8f14271f098ec7a2da4 (patch) | |
| tree | 8cdd9e17f6a6ff4cb6166ad12a4d3ed1d45b2dc9 /net/socket.c | |
| parent | b3bc2c5562f06ca34b30f61c5714e96490946c81 (diff) | |
| parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 8ef8ba81b9e2..3e8d4e35c08f 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -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) |