Skip to contentSkip to conversation

more UID16 fixes

PATCH In review Adrian Bunk 2 participants 2 messages Jan 8, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 more UID16 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).

---

 arch/frv/Kconfig    |    4 ----
 arch/m32r/Kconfig   |    4 ----
 arch/s390/Kconfig   |    5 -----
 arch/sh64/Kconfig   |    4 ----
 arch/xtensa/Kconfig |    4 ----
 init/Kconfig        |    4 +---
 6 files changed, 1 insertion(+), 24 deletions(-)
init/Kconfig renamed from init/Kconfig.old +1 -3
@@ -230,9 +230,7 @@
 
 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.
arch/frv/Kconfig renamed from arch/frv/Kconfig.old +0 -4
@@ -6,10 +6,6 @@
 	bool
 	default y
 
-config UID16
-	bool
-	default y
-
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
arch/m32r/Kconfig renamed from arch/m32r/Kconfig.old +0 -4
@@ -12,10 +12,6 @@
 config SBUS
 	bool
 
-config UID16
-	bool
-	default n
-
 config GENERIC_ISA_DMA
 	bool
 	default y
arch/s390/Kconfig renamed from arch/s390/Kconfig.old +0 -5
@@ -27,11 +27,6 @@
 	bool
 	default y
 
-config UID16
-	bool
-	default y
-	depends on !64BIT
-
 source "init/Kconfig"
 
 menu "Base setup"
arch/sh64/Kconfig renamed from arch/sh64/Kconfig.old +0 -4
@@ -17,10 +17,6 @@
 	bool
 	default y
 
-config UID16
-	bool
-	default y
-
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
arch/xtensa/Kconfig renamed from arch/xtensa/Kconfig.old +0 -4
@@ -18,10 +18,6 @@
 	  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
#1 lore raw
Quoted 9 lines · Adrian Bunk

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

Quoted 3 lines

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

Yeah, that's a better approach. Thanks.

Quoted 1 line
Signature · 1 line
Mathematics is the supreme nostalgia of our time.