aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-01-09 20:51:26 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:01:23 -0800
commit2308acca656c3625c46b671b348fb04b6b006cad (patch)
tree10dff065667d56f680315dfeb93c506aa65e101b
parent1306a482288152ea0ac091c7a8471adc5569e6c8 (diff)
[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>
-rw-r--r--arch/frv/Kconfig4
-rw-r--r--arch/m32r/Kconfig4
-rw-r--r--arch/s390/Kconfig5
-rw-r--r--arch/sh64/Kconfig4
-rw-r--r--arch/xtensa/Kconfig4
-rw-r--r--init/Kconfig4
6 files changed, 1 insertions, 24 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 61261b78ced..60a617aff8b 100644
--- 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 fae67bbb52f..a3dcc3fab4b 100644
--- 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 6fe532d8241..b66602ad7b3 100644
--- 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 fb35b45dc13..07b172deb87 100644
--- 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 7e841aa2a4a..7ee4a14ec3b 100644
--- 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 f8f6929d8f2..9bdd5492a95 100644
--- 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.