arch: Add SYSVIPC_COMPAT for all architectures

The existing per-arch definitions are pretty much historic cruft.
Move SYSVIPC_COMPAT into init/Kconfig.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Helge Deller <deller@gmx.de>  # parisc
Link: https://lore.kernel.org/r/20220405071314.3225832-5-guoren@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 57c4c995965f8291bf3c89303bc8c00dc0276dd4..ff674808681a93f81afa9bf95c132a4d51eb8c5b 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -2122,10 +2122,6 @@ config DMI
 
 endmenu
 
-config SYSVIPC_COMPAT
-       def_bool y
-       depends on COMPAT && SYSVIPC
-
 menu "Power management options"
 
 source "kernel/power/Kconfig"

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index de3b32a507d230cad6ae9659d33ce7b61c5d6808..0055482cd20f1afc3dc93961b03c5c0e5f7bbee7 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3198,16 +3198,12 @@ config MIPS32_COMPAT
 config COMPAT
        bool
 
-config SYSVIPC_COMPAT
-       bool
-
 config MIPS32_O32
        bool "Kernel support for o32 binaries"
        depends on 64BIT
        select ARCH_WANT_OLD_COMPAT_IPC
        select COMPAT
        select MIPS32_COMPAT
-       select SYSVIPC_COMPAT if SYSVIPC
        help
          Select this option if you want to run o32 binaries.  These are pure
          32-bit binaries as used by the 32-bit Linux/MIPS port.  Most of
@@ -3221,7 +3217,6 @@ config MIPS32_N32
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        select COMPAT
        select MIPS32_COMPAT
-       select SYSVIPC_COMPAT if SYSVIPC
        help
          Select this option if you want to run n32 binaries.  These are
          64-bit binaries using 32-bit quantities for addressing and certain

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 52e550b45692402c4aca3ec88bc571e1002da99b..93cb07a4446fdf5ceeb8c0db8bf700a4c10b8d33 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -331,10 +331,6 @@ config COMPAT
        def_bool y
        depends on 64BIT
 
-config SYSVIPC_COMPAT
-       def_bool y
-       depends on COMPAT && SYSVIPC
-
 config AUDIT_ARCH
        def_bool y
 

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 174edabb74fa112d80c3993c76e461910ef21d16..6edb294a34efd85692adac790e96b98b3de45054 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -298,11 +298,6 @@ config COMPAT
        select ARCH_WANT_OLD_COMPAT_IPC
        select COMPAT_OLD_SIGACTION
 
-config SYSVIPC_COMPAT
-       bool
-       depends on COMPAT && SYSVIPC
-       default y
-
 config SCHED_OMIT_FRAME_POINTER
        bool
        default y

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 77b5a03de13a97558a606d08a1c462cc20f543aa..555b7ea5ecf5b997289fd80fcc4c8f2702592c0f 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -399,9 +399,6 @@ config COMPAT
          (and some other stuff like libraries and such) is needed for
          executing 31 bit applications.  It is safe to say "Y".
 
-config SYSVIPC_COMPAT
-       def_bool y if COMPAT && SYSVIPC
-
 config SMP
        def_bool y
 

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 9200bc04701c9d395c55cb4e28e314a8f8724497..9c1cce74953a9429b50218daffeae7e529f41c26 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -488,9 +488,4 @@ config COMPAT
        select ARCH_WANT_OLD_COMPAT_IPC
        select COMPAT_OLD_SIGACTION
 
-config SYSVIPC_COMPAT
-       bool
-       depends on COMPAT && SYSVIPC
-       default y
-
 source "drivers/sbus/char/Kconfig"

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b0142e01002e3dd4fc3299f23da6ce2e6aaa3997..65690b950f5f4d4f2cfe1caec05c18cb3bec8bff 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2872,10 +2872,6 @@ config COMPAT
 if COMPAT
 config COMPAT_FOR_U64_ALIGNMENT
        def_bool y
-
-config SYSVIPC_COMPAT
-       def_bool y
-       depends on SYSVIPC
 endif
 
 endmenu

diff --git a/init/Kconfig b/init/Kconfig
index ddcbefe535e9e784d170bf2dd765dc0ad3e81652..9fa3ee6bf12a6294b21f685765a32b68c7b9fd94 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -390,6 +390,10 @@ config SYSVIPC_SYSCTL
        depends on SYSCTL
        default y
 
+config SYSVIPC_COMPAT
+       def_bool y
+       depends on COMPAT && SYSVIPC
+
 config POSIX_MQUEUE
        bool "POSIX Message Queues"
        depends on NET