Skip to content

Commit

Permalink
arch: Add SYSVIPC_COMPAT for all architectures
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Guo Ren authored and Palmer Dabbelt committed Apr 26, 2022
1 parent 3ce0f23 commit 0cbed0e
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 30 deletions.
4 changes: 0 additions & 4 deletions arch/arm64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions arch/parisc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions arch/s390/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions arch/sparc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 0 additions & 4 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0cbed0e

Please sign in to comment.