[PATCH] "tiny-make-id16-support-optional" fixes

It seems the "make UID16 support optional" patch was checked when it
edited the -tiny tree some time ago, but it wasn't checked whether it
still matches the current situation when it was submitted for inclusion
in -mm. This patch fixes the following bugs:
- ARCH_S390X does no longer exist, nowadays this has to be expressed
  through (S390 && 64BIT)
- in five architecture specific Kconfig files the UID16 options
  weren't removed

Additionally, it changes the fragile negative dependencies of UID16 to
positive dependencies (new architectures are more likely to not require
UID16 support).

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 61261b78ced7617571f349edbb683050d2f51741..60a617aff8ba465d83b38f09ebf9cbdc1dbe684c 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -6,10 +6,6 @@ config FRV
        bool
        default y
 
-config UID16
-       bool
-       default y
-
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index fae67bbb52f614fa27566636ad7952db512a81cb..a3dcc3fab4b736660ab3b621d3321c730949f501 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -12,10 +12,6 @@ config M32R
 config SBUS
        bool
 
-config UID16
-       bool
-       default n
-
 config GENERIC_ISA_DMA
        bool
        default y

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6fe532d82417d8acf89bc3a97217999cd5b09344..b66602ad7b33073fe7a5b0d307703f9d0c6768f9 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -27,11 +27,6 @@ config S390
        bool
        default y
 
-config UID16
-       bool
-       default y
-       depends on !64BIT
-
 source "init/Kconfig"
 
 menu "Base setup"

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index fb35b45dc130074b3fd6d0170c58588f17885f1e..07b172deb872b46478d5d44df926efcddf2acc98 100644 (file)
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -17,10 +17,6 @@ config MMU
        bool
        default y
 
-config UID16
-       bool
-       default y
-
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7e841aa2a4aa1259ea9e7367d40f84fd617a5822..7ee4a14ec3b1949d38766b4247bf71d2f2f14159 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -18,10 +18,6 @@ config XTENSA
          with reasonable minimum requirements.  The Xtensa Linux project has
          a home page at <http://xtensa.sourceforge.net/>.
 
-config UID16
-       bool
-       default n
-
 config RWSEM_XCHGADD_ALGORITHM
        bool
        default y

diff --git a/init/Kconfig b/init/Kconfig
index f8f6929d8f254ea70422589d916d3cb2fc796766..9bdd5492a95b4e8711a7e5969322fcc1e1c0dee6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -230,9 +230,7 @@ source "usr/Kconfig"
 
 config UID16
        bool "Enable 16-bit UID system calls" if EMBEDDED
-       depends !ALPHA && !PPC && !PPC64 && !PARISC && !V850 && !ARCH_S390X
-       depends !X86_64 || IA32_EMULATION
-       depends !SPARC64 || SPARC32_COMPAT
+       depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.