Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fa3ccd authored by Michael Cree's avatar Michael Cree Committed by Linus Torvalds
Browse files

alpha: Don't export SOCK_NONBLOCK to user space. 



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: default avatarMichael Cree <mcree@orcon.net.nz>
Acked-by: default avatarMatt Turner <mattst88@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0d7614f0

arch/alpha/include/asm/socket.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -76,9 +76,11 @@ 
/* Instruct lower device to use last 4-bytes of skb data as FCS */

/* Instruct lower device to use last 4-bytes of skb data as FCS */

#define SO_NOFCS		43

#define SO_NOFCS		43





#ifdef __KERNEL__

/* O_NONBLOCK clashes with the bits used for socket types.  Therefore we

/* O_NONBLOCK clashes with the bits used for socket types.  Therefore we

 * have to define SOCK_NONBLOCK to a different value here.

 * have to define SOCK_NONBLOCK to a different value here.

 */

 */

#define SOCK_NONBLOCK	0x40000000

#define SOCK_NONBLOCK	0x40000000

#endif /* __KERNEL__ */





#endif /* _ASM_SOCKET_H */
 
#endif /* _ASM_SOCKET_H */