[PATCH 6/9] Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES

["Randy.Dunlap" <rdunlap@xenotime.net>]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/mips/Kconfig         |    3 +++
 include/asm-mips/socket.h |    5 ++---
 include/linux/net.h       |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

--- linux-2618-rc4-arch.orig/include/asm-mips/socket.h
+++ linux-2618-rc4-arch/include/asm-mips/socket.h
@@ -77,7 +77,8 @@ To add: #define SO_REUSEPORT 0x0200	/* A
  *
  * Please notice that for binary compat reasons MIPS has to
  * override the enum sock_type in include/linux/net.h, so
- * we define ARCH_HAS_SOCKET_TYPES here.
+ * include/linux/net.h checks for ifdef CONFIG_ARCH_SOCKET_TYPES
+ * to see if these are already defined.
  *
  * @SOCK_DGRAM - datagram (conn.less) socket
  * @SOCK_STREAM - stream (connection) socket
@@ -99,8 +100,6 @@ enum sock_type {
 
 #define SOCK_MAX (SOCK_PACKET + 1)
 
-#define ARCH_HAS_SOCKET_TYPES 1
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_SOCKET_H */
--- linux-2618-rc4-arch.orig/include/linux/net.h
+++ linux-2618-rc4-arch/include/linux/net.h
@@ -63,7 +63,7 @@ typedef enum {
 #define SOCK_PASSCRED		3
 #define SOCK_PASSSEC		4
 
-#ifndef ARCH_HAS_SOCKET_TYPES
+#ifndef CONFIG_ARCH_SOCKET_TYPES
 /**
  * enum sock_type - Socket types
  * @SOCK_STREAM: stream (connection) socket
@@ -91,7 +91,7 @@ enum sock_type {
 
 #define SOCK_MAX (SOCK_PACKET + 1)
 
-#endif /* ARCH_HAS_SOCKET_TYPES */
+#endif /* CONFIG_ARCH_SOCKET_TYPES */
 
 /**
  *  struct socket - general BSD socket
--- linux-2618-rc4-arch.orig/arch/mips/Kconfig
+++ linux-2618-rc4-arch/arch/mips/Kconfig
@@ -915,6 +915,9 @@ config MIPS_NILE4
 config MIPS_DISABLE_OBSOLETE_IDE
 	bool
 
+config ARCH_SOCKET_TYPES
+	def_bool y
+
 #
 # Endianess selection.  Suffiently obscure so many users don't know what to
 # answer,so we try hard to limit the available choices.  Also the use of a


---
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/