Kconfig: clean up the long arch list for the UID16 config option

Introduce HAVE_UID16 config option and select it in corresponding
architecture Kconfig files.  UID16 now only depends on HAVE_UID16.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6d2f7f5c0036fee1d6d2a033d6ea3e1cc6729235..5f54396729328bf6c40e8e1cb6e8061bbf7752a3 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -39,6 +39,7 @@ config ARM
        select HARDIRQS_SW_RESEND
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
+       select HAVE_UID16
        select ARCH_WANT_IPC_PARSE_VERSION
        select HARDIRQS_SW_RESEND
        select CPU_PM if (SUSPEND || CPU_IDLE)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 767ba56854548e44ffc855a43478d436b5869f8e..e61acae0d891309120edceea87574608dc2a0800 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -193,6 +193,7 @@ config COMPAT
        bool "Kernel support for 32-bit EL0"
        depends on !ARM64_64K_PAGES
        select COMPAT_BINFMT_ELF
+       select HAVE_UID16
        help
          This option enables support for a 32-bit EL0 running under a 64-bit
          kernel at EL1. AArch32-specific components such as system calls,

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index c7092e6057c56e4fa856362263ed4ac49a95d32e..2169889c73ec4d07d6a7be1644414a89a383c32e 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -33,6 +33,7 @@ config BLACKFIN
        select HAVE_PERF_EVENTS
        select ARCH_HAVE_CUSTOM_GPIO_H
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select HAVE_UID16
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_ATOMIC64

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 72bd5ae50a890fd1fda0afe419553cf631bd2f2e..a118163b04ee09051f6447d17017869d58cc6590 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -42,6 +42,7 @@ config CRIS
        select HAVE_IDE
        select GENERIC_ATOMIC64
        select HAVE_GENERIC_HARDIRQS
+       select HAVE_UID16
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 971c0a19facb694706f68722645aa5101afbeea6..cc5709d183502be10785b8dfc4312a459d9fcef1 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,6 +5,7 @@ config FRV
        select HAVE_ARCH_TRACEHOOK
        select HAVE_IRQ_WORK
        select HAVE_PERF_EVENTS
+       select HAVE_UID16
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select ARCH_HAVE_NMI_SAFE_CMPXCHG

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 5e8a0d9a09ce0035e424dc0334370607f306deb9..90462eb23d02af5683bcd2361d7af16686c4a994 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -3,6 +3,7 @@ config H8300
        default y
        select HAVE_IDE
        select HAVE_GENERIC_HARDIRQS
+       select HAVE_UID16
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index b22df9410dceb75169f4127bb897befb6f4960ad..3e2b2f66db607ac96eb6750b26aeae8ff80ce943 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -6,6 +6,7 @@ config M68K
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_ATOMIC64
+       select HAVE_UID16
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
        select GENERIC_CPU_DEVICES
        select GENERIC_STRNCPY_FROM_USER if MMU

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c8af429991d98748ec8dbc635d461885ab32eee7..baba37cfcf84180beb61e034e622999779f0e53a 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -126,6 +126,7 @@ config S390
        select ARCH_INLINE_WRITE_UNLOCK_BH
        select ARCH_INLINE_WRITE_UNLOCK_IRQ
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
+       select HAVE_UID16 if 32BIT
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 36f5141e80417ac6172ce6965602e4d15a67bdfb..f0c85e42477730f41eed58f6942c3681b63b4822 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -21,6 +21,7 @@ config SUPERH
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_XZ
        select HAVE_KERNEL_LZO
+       select HAVE_UID16
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_REGS_AND_STACK_ACCESS_API

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 67f1f6f5f4e14fa35408cda35ad1464297dd2859..e66481015d3bf868ab9aeed4317dc5d9f4a6ca12 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -42,6 +42,7 @@ config SPARC32
        def_bool !64BIT
        select GENERIC_ATOMIC64
        select CLZ_TAB
+       select HAVE_UID16
 
 config SPARC64
        def_bool 64BIT
@@ -571,6 +572,7 @@ config COMPAT
        depends on SPARC64
        default y
        select COMPAT_BINFMT_ELF
+       select HAVE_UID16
        select ARCH_WANT_OLD_COMPAT_IPC
 
 config SYSVIPC_COMPAT

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index cb837c22392203d0ef258dd9aa614f6b52f42a79..648121b037d55fd5f4962626ca79ac27022b38e1 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -7,6 +7,7 @@ config UML
        bool
        default y
        select HAVE_GENERIC_HARDIRQS
+       select HAVE_UID16
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select GENERIC_IO

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b72777ff32a9439ad401779b3bdce873f0d0b744..fd5d7c2c2daaa10b875a6e10c269574e661ccf2d 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -10,6 +10,7 @@ config X86_32
        def_bool y
        depends on !64BIT
        select CLKSRC_I8253
+       select HAVE_UID16
 
 config X86_64
        def_bool y
@@ -2168,6 +2169,7 @@ config IA32_EMULATION
        bool "IA32 Emulation"
        depends on X86_64
        select COMPAT_BINFMT_ELF
+       select HAVE_UID16
        ---help---
          Include code to run legacy 32-bit programs under a
          64-bit kernel. You should likely turn this on, unless you're

diff --git a/init/Kconfig b/init/Kconfig
index ed6334dd5e718cb874e4b4d272b652fadb101a8d..38bab420bd9bc2d945691d3a755f6bf59eed8e6d 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1125,10 +1125,12 @@ menuconfig EXPERT
           environments which can tolerate a "non-standard" kernel.
           Only use this if you really know what you are doing.
 
+config HAVE_UID16
+       bool
+
 config UID16
        bool "Enable 16-bit UID system calls" if EXPERT
-       depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) \
-               || AARCH32_EMULATION
+       depends on HAVE_UID16
        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.