From: Andrew Morton <akpm@linux-foundation.org>

Cc: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Cc: Ulrich Drepper <drepper@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/socket.c |    1 -
 1 file changed, 1 deletion(-)

diff -puN net/socket.c~flag-parameters-check-magic-constants-alpha net/socket.c
--- a/net/socket.c~flag-parameters-check-magic-constants-alpha
+++ a/net/socket.c
@@ -1223,7 +1223,6 @@ asmlinkage long sys_socket(int family, i
 
 	/* Check the SOCK_* constants for consistency.  */
 	BUILD_BUG_ON(SOCK_CLOEXEC != O_CLOEXEC);
-	BUILD_BUG_ON(SOCK_NONBLOCK != O_NONBLOCK);
 	BUILD_BUG_ON((SOCK_MAX | SOCK_TYPE_MASK) != SOCK_TYPE_MASK);
 	BUILD_BUG_ON(SOCK_CLOEXEC & SOCK_TYPE_MASK);
 	BUILD_BUG_ON(SOCK_NONBLOCK & SOCK_TYPE_MASK);
_