Skip to content

Commit

Permalink
[PATCH] "tiny-make-id16-support-optional" fixes
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Matt Mackall <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
AdrianBunk authored and Linus Torvalds committed Jan 10, 2006
1 parent 1306a48 commit 2308acc
Showing 6 changed files with 1 addition and 24 deletions.
4 changes: 0 additions & 4 deletions arch/frv/Kconfig
Original file line number Diff line number Diff line change
@@ -6,10 +6,6 @@ config FRV
bool
default y

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
4 changes: 0 additions & 4 deletions arch/m32r/Kconfig
Original file line number Diff line number Diff line change
@@ -12,10 +12,6 @@ config M32R
config SBUS
bool

config UID16
bool
default n

config GENERIC_ISA_DMA
bool
default y
5 changes: 0 additions & 5 deletions arch/s390/Kconfig
Original file line number Diff line number Diff line change
@@ -27,11 +27,6 @@ config S390
bool
default y

config UID16
bool
default y
depends on !64BIT

source "init/Kconfig"

menu "Base setup"
4 changes: 0 additions & 4 deletions arch/sh64/Kconfig
Original file line number Diff line number Diff line change
@@ -17,10 +17,6 @@ config MMU
bool
default y

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
4 changes: 0 additions & 4 deletions arch/xtensa/Kconfig
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions init/Kconfig
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 2308acc

Please sign in to comment.