---

yaml --- r: 109943 b: refs/heads/master c: 2d4c826 h: refs/heads/master i: 109941: 7bca7e3 109939: 7eb7911 109935: 86a315c v: v3
git-mirror · Sep 23, 2008 · dcb807f · dcb807f
1 parent 8c238a2
commit dcb807f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6675ce13ed783f88ea5d82f0d855462b76ff0dad
+refs/heads/master: 2d4c8266774188cda7f7e612e6dfb8ad12c579d5
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
@@ -1511,6 +1511,7 @@ long do_accept(int fd, struct sockaddr __user *upeer_sockaddr,
 	goto out_put;
 }
 
+#if 0
 #ifdef HAVE_SET_RESTORE_SIGMASK
 asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
 			    int __user *upeer_addrlen,
@@ -1564,6 +1565,7 @@ asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
 	return do_accept(fd, upeer_sockaddr, upeer_addrlen, flags);
 }
 #endif
+#endif
 
 asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
 			   int __user *upeer_addrlen)