alpha: Don't export SOCK_NONBLOCK to user space.
authorMichael Cree <mcree@orcon.net.nz>
Sun, 19 Aug 2012 02:40:56 +0000 (14:40 +1200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Sep 2012 16:59:24 +0000 (09:59 -0700)
commit6a09f9b5bf2061f23350625c42e9ad4792e1d483
treea28539dc3de0e0fccc0a6037a6a187b0d9ecefbb
parent20b223443ed020f873f05d68342e3acec70f8100
alpha: Don't export SOCK_NONBLOCK to user space.

commit a2fa3ccd7b43665fe14cb562761a6c3d26a1d13f upstream.

Currently we export SOCK_NONBLOCK to user space but that conflicts with
the definition from glibc leading to compilation errors in user programs
(e.g.  see Debian bug #658460).

The generic socket.h restricts the definition of SOCK_NONBLOCK to the
kernel, as does the MIPS specific socket.h, so let's do the same on
Alpha.

Signed-off-by: Michael Cree <mcree@orcon.net.nz>
Acked-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/alpha/include/asm/socket.h