diff options
| author | Michael Cree <mcree@orcon.net.nz> | 2012-08-19 14:40:56 +1200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-09-12 03:37:14 +0100 |
| commit | c93f5803e234956a070c7c443fb5a4620d012cc8 (patch) | |
| tree | 20ddeb18ba631a33cb83be22119bb0b15fd0a9db /arch/alpha | |
| parent | 76e0246b1c62a12db0c9af652be580019ee4666a (diff) | |
| download | kernel_samsung_smdk4412-c93f5803e234956a070c7c443fb5a4620d012cc8.zip kernel_samsung_smdk4412-c93f5803e234956a070c7c443fb5a4620d012cc8.tar.gz kernel_samsung_smdk4412-c93f5803e234956a070c7c443fb5a4620d012cc8.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/socket.h b/arch/alpha/include/asm/socket.h index 06edfef..3eeb47c 100644 --- a/arch/alpha/include/asm/socket.h +++ b/arch/alpha/include/asm/socket.h @@ -69,9 +69,11 @@ #define SO_RXQ_OVFL 40 +#ifdef __KERNEL__ /* O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here. */ #define SOCK_NONBLOCK 0x40000000 +#endif /* __KERNEL__ */ #endif /* _ASM_SOCKET_H */ |