Skip to content

Commit af1839e

Browse files
ctmarinastorvalds
authored andcommitted
Kconfig: clean up the long arch list for the UID16 config option
Introduce HAVE_UID16 config option and select it in corresponding architecture Kconfig files. UID16 now only depends on HAVE_UID16. Signed-off-by: Catalin Marinas <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Cc: Russell King <[email protected]> Cc: Mike Frysinger <[email protected]> Cc: Mikael Starvik <[email protected]> Cc: Jesper Nilsson <[email protected]> Cc: David Howells <[email protected]> Cc: Yoshinori Sato <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Paul Mundt <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Jeff Dike <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 6e28b76 commit af1839e

File tree

13 files changed

+18
-2
lines changed

13 files changed

+18
-2
lines changed

arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ config ARM
3939
select HARDIRQS_SW_RESEND
4040
select GENERIC_IRQ_PROBE
4141
select GENERIC_IRQ_SHOW
42+
select HAVE_UID16
4243
select ARCH_WANT_IPC_PARSE_VERSION
4344
select HARDIRQS_SW_RESEND
4445
select CPU_PM if (SUSPEND || CPU_IDLE)

arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ config COMPAT
193193
bool "Kernel support for 32-bit EL0"
194194
depends on !ARM64_64K_PAGES
195195
select COMPAT_BINFMT_ELF
196+
select HAVE_UID16
196197
help
197198
This option enables support for a 32-bit EL0 running under a 64-bit
198199
kernel at EL1. AArch32-specific components such as system calls,

arch/blackfin/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ config BLACKFIN
3333
select HAVE_PERF_EVENTS
3434
select ARCH_HAVE_CUSTOM_GPIO_H
3535
select ARCH_WANT_OPTIONAL_GPIOLIB
36+
select HAVE_UID16
3637
select ARCH_WANT_IPC_PARSE_VERSION
3738
select HAVE_GENERIC_HARDIRQS
3839
select GENERIC_ATOMIC64

arch/cris/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ config CRIS
4242
select HAVE_IDE
4343
select GENERIC_ATOMIC64
4444
select HAVE_GENERIC_HARDIRQS
45+
select HAVE_UID16
4546
select ARCH_WANT_IPC_PARSE_VERSION
4647
select GENERIC_IRQ_SHOW
4748
select GENERIC_IOMAP

arch/frv/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ config FRV
55
select HAVE_ARCH_TRACEHOOK
66
select HAVE_IRQ_WORK
77
select HAVE_PERF_EVENTS
8+
select HAVE_UID16
89
select HAVE_GENERIC_HARDIRQS
910
select GENERIC_IRQ_SHOW
1011
select ARCH_HAVE_NMI_SAFE_CMPXCHG

arch/h8300/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ config H8300
33
default y
44
select HAVE_IDE
55
select HAVE_GENERIC_HARDIRQS
6+
select HAVE_UID16
67
select ARCH_WANT_IPC_PARSE_VERSION
78
select GENERIC_IRQ_SHOW
89
select GENERIC_CPU_DEVICES

arch/m68k/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ config M68K
66
select HAVE_GENERIC_HARDIRQS
77
select GENERIC_IRQ_SHOW
88
select GENERIC_ATOMIC64
9+
select HAVE_UID16
910
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
1011
select GENERIC_CPU_DEVICES
1112
select GENERIC_STRNCPY_FROM_USER if MMU

arch/s390/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ config S390
126126
select ARCH_INLINE_WRITE_UNLOCK_BH
127127
select ARCH_INLINE_WRITE_UNLOCK_IRQ
128128
select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
129+
select HAVE_UID16 if 32BIT
129130
select ARCH_WANT_IPC_PARSE_VERSION
130131
select GENERIC_SMP_IDLE_THREAD
131132
select GENERIC_TIME_VSYSCALL

arch/sh/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ config SUPERH
2121
select HAVE_KERNEL_LZMA
2222
select HAVE_KERNEL_XZ
2323
select HAVE_KERNEL_LZO
24+
select HAVE_UID16
2425
select ARCH_WANT_IPC_PARSE_VERSION
2526
select HAVE_SYSCALL_TRACEPOINTS
2627
select HAVE_REGS_AND_STACK_ACCESS_API

arch/sparc/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ config SPARC32
4242
def_bool !64BIT
4343
select GENERIC_ATOMIC64
4444
select CLZ_TAB
45+
select HAVE_UID16
4546

4647
config SPARC64
4748
def_bool 64BIT
@@ -571,6 +572,7 @@ config COMPAT
571572
depends on SPARC64
572573
default y
573574
select COMPAT_BINFMT_ELF
575+
select HAVE_UID16
574576
select ARCH_WANT_OLD_COMPAT_IPC
575577

576578
config SYSVIPC_COMPAT

arch/um/Kconfig.common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ config UML
77
bool
88
default y
99
select HAVE_GENERIC_HARDIRQS
10+
select HAVE_UID16
1011
select GENERIC_IRQ_SHOW
1112
select GENERIC_CPU_DEVICES
1213
select GENERIC_IO

arch/x86/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ config X86_32
1010
def_bool y
1111
depends on !64BIT
1212
select CLKSRC_I8253
13+
select HAVE_UID16
1314

1415
config X86_64
1516
def_bool y
@@ -2168,6 +2169,7 @@ config IA32_EMULATION
21682169
bool "IA32 Emulation"
21692170
depends on X86_64
21702171
select COMPAT_BINFMT_ELF
2172+
select HAVE_UID16
21712173
---help---
21722174
Include code to run legacy 32-bit programs under a
21732175
64-bit kernel. You should likely turn this on, unless you're

init/Kconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,10 +1125,12 @@ menuconfig EXPERT
11251125
environments which can tolerate a "non-standard" kernel.
11261126
Only use this if you really know what you are doing.
11271127

1128+
config HAVE_UID16
1129+
bool
1130+
11281131
config UID16
11291132
bool "Enable 16-bit UID system calls" if EXPERT
1130-
depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) \
1131-
|| AARCH32_EMULATION
1133+
depends on HAVE_UID16
11321134
default y
11331135
help
11341136
This enables the legacy 16-bit UID syscall wrappers.

0 commit comments

Comments
 (0)