* Arnd Bergmann: > diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h > index 0d0fddb7e738..976e89b116e5 100644 > --- a/arch/alpha/include/uapi/asm/socket.h > +++ b/arch/alpha/include/uapi/asm/socket.h > @@ -2,8 +2,8 @@ > #ifndef _UAPI_ASM_SOCKET_H > #define _UAPI_ASM_SOCKET_H > > +#include <linux/posix_types.h> > #include <asm/sockios.h> > -#include <asm/bitsperlong.h> This breaks POSIX conformance in glibc because the <linux/posix_types.h> header is not namespace clean. It contains the identifiers fds_bits and val: unsigned long fds_bits[__FD_SETSIZE / (8 * sizeof(long))]; int val[2]; We could duplicate some of the SO_* constants for POSIX mode in glibc, but it would be nice to avoid that. Is there a different way of fixing this on the kernel side that avoids including <linux/posix_types.h>?