The patch titled
Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES
has been removed from the -mm tree. Its filename is
replace-arch_has_socket_types-with.patch
This patch was dropped because it looks like we should be adding all-arch stubs
------------------------------------------------------
Subject: Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES. Move it from
header files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/mips/Kconfig | 3 +++
include/asm-mips/socket.h | 5 ++---
include/linux/net.h | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff -puN arch/mips/Kconfig~replace-arch_has_socket_types-with arch/mips/Kconfig
--- a/arch/mips/Kconfig~replace-arch_has_socket_types-with
+++ a/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
diff -puN include/asm-mips/socket.h~replace-arch_has_socket_types-with include/asm-mips/socket.h
--- a/include/asm-mips/socket.h~replace-arch_has_socket_types-with
+++ a/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 */
diff -puN include/linux/net.h~replace-arch_has_socket_types-with include/linux/net.h
--- a/include/linux/net.h~replace-arch_has_socket_types-with
+++ a/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
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
acpi-handle-firmware_register-init-errors.patch
acpi-scan-handle-kset-kobject-errors.patch
acpi-fix-printk-format-warnings.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
kobject-must_check-fixes.patch
drivers-base-check-errors.patch
sysfs-add-proper-sysfs_init-prototype.patch
bttv-must_check-fixes.patch
git-lxdialog.patch
mtd-printk-format-warning.patch
pcmcia-ds-must_check-fixes.patch
libsas-externs-not-needed.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
scsi-target-printk-format-warnings.patch
usbnet-printk-format-warning.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
tiacx-sparse-cleanups.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
replace-arch_has_socket_types-with.patch
replace-arch_has_valid_phys_addr_range-with.patch
replace-__arch_has_no_page_zero_mapped-with.patch
replace-arch_has_power_init-with-config_acpi_power_init.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
