Unverified Commit 4e83ae6e authored by Christian Brauner's avatar Christian Brauner
Browse files

mips, net: ensure that SOCK_COREDUMP is defined 



For historical reasons mips has to override the socket enum values but
the defines are all the same. So simply move the ARCH_HAS_SOCKET_TYPES
scope.

Fixes: a9194f88 ("coredump: add coredump socket")
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent a3b4ca60

arch/mips/include/asm/socket.h

+0 −9
Original line number Diff line number Diff line
@@ -36,15 +36,6 @@ enum sock_type { 
	SOCK_PACKET	= 10,

};



#define SOCK_MAX (SOCK_PACKET + 1)

/* Mask which covers at least up to SOCK_MASK-1.  The

 *  * remaining bits are used as flags. */

#define SOCK_TYPE_MASK 0xf



/* Flags for socket, socketpair, paccept */

#define SOCK_CLOEXEC	O_CLOEXEC

#define SOCK_NONBLOCK	O_NONBLOCK



#define ARCH_HAS_SOCKET_TYPES 1



#endif /* _ASM_SOCKET_H */

include/linux/net.h

+1 −2
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ enum sock_type { 
	SOCK_DCCP	= 6,

	SOCK_PACKET	= 10,

};

#endif /* ARCH_HAS_SOCKET_TYPES */



#define SOCK_MAX (SOCK_PACKET + 1)

/* Mask which covers at least up to SOCK_MASK-1.  The
@@ -83,8 +84,6 @@ enum sock_type { 
#endif

#define SOCK_COREDUMP	O_NOCTTY



#endif /* ARCH_HAS_SOCKET_TYPES */



/**

 * enum sock_shutdown_cmd - Shutdown types

 * @SHUT_RD: shutdown receptions