Commit 2308acca authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1306a482
...@@ -6,10 +6,6 @@ config FRV ...@@ -6,10 +6,6 @@ config FRV
bool bool
default y default y
config UID16
bool
default y
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
bool bool
default y default y
......
...@@ -12,10 +12,6 @@ config M32R ...@@ -12,10 +12,6 @@ config M32R
config SBUS config SBUS
bool bool
config UID16
bool
default n
config GENERIC_ISA_DMA config GENERIC_ISA_DMA
bool bool
default y default y
......
...@@ -27,11 +27,6 @@ config S390 ...@@ -27,11 +27,6 @@ config S390
bool bool
default y default y
config UID16
bool
default y
depends on !64BIT
source "init/Kconfig" source "init/Kconfig"
menu "Base setup" menu "Base setup"
......
...@@ -17,10 +17,6 @@ config MMU ...@@ -17,10 +17,6 @@ config MMU
bool bool
default y default y
config UID16
bool
default y
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
bool bool
default y default y
......
...@@ -18,10 +18,6 @@ config XTENSA ...@@ -18,10 +18,6 @@ config XTENSA
with reasonable minimum requirements. The Xtensa Linux project has with reasonable minimum requirements. The Xtensa Linux project has
a home page at <http://xtensa.sourceforge.net/>. a home page at <http://xtensa.sourceforge.net/>.
config UID16
bool
default n
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
bool bool
default y default y
......
...@@ -230,9 +230,7 @@ source "usr/Kconfig" ...@@ -230,9 +230,7 @@ source "usr/Kconfig"
config UID16 config UID16
bool "Enable 16-bit UID system calls" if EMBEDDED bool "Enable 16-bit UID system calls" if EMBEDDED
depends !ALPHA && !PPC && !PPC64 && !PARISC && !V850 && !ARCH_S390X depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
depends !X86_64 || IA32_EMULATION
depends !SPARC64 || SPARC32_COMPAT
default y default y
help help
This enables the legacy 16-bit UID syscall wrappers. This enables the legacy 16-bit UID syscall wrappers.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment