From dcb807f8f938b94d836ed38c7d5aa9fb3868ceb5 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@googlemail.com>
Date: Mon, 22 Sep 2008 13:57:49 -0700
Subject: [PATCH] --- yaml --- r: 109943 b: refs/heads/master c:
 2d4c8266774188cda7f7e612e6dfb8ad12c579d5 h: refs/heads/master i:   109941:
 7bca7e34e59e0a219051b1af366de2c818970d35   109939:
 7eb79115c8aaa73754b71178bc6702341bfc363b   109935:
 86a315c49d3641d512cb977ed3db1eddb31eb662 v: v3

---
 [refs]             | 2 +-
 trunk/net/socket.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf298910448e..f4d4cc252900 100644
--- 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
index 8ef8ba81b9e2..3e8d4e35c08f 100644
--- 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)