Skip to content

Commit 129975e

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/Kconfig: sort config S390 select list once again
...and add comments at the top and bottom. Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 742eb47 commit 129975e

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

arch/s390/Kconfig

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,23 @@ config KASAN_SHADOW_OFFSET
5454

5555
config S390
5656
def_bool y
57+
#
58+
# Note: keep this list sorted alphabetically
59+
#
60+
imply IMA_SECURE_AND_OR_TRUSTED_BOOT
5761
select ARCH_BINFMT_ELF_STATE
5862
select ARCH_HAS_DEBUG_VM_PGTABLE
5963
select ARCH_HAS_DEBUG_WX
6064
select ARCH_HAS_DEVMEM_IS_ALLOWED
6165
select ARCH_HAS_ELF_RANDOMIZE
66+
select ARCH_HAS_FORCE_DMA_UNENCRYPTED
6267
select ARCH_HAS_FORTIFY_SOURCE
6368
select ARCH_HAS_GCOV_PROFILE_ALL
6469
select ARCH_HAS_GIGANTIC_PAGE
6570
select ARCH_HAS_KCOV
6671
select ARCH_HAS_MEM_ENCRYPT
6772
select ARCH_HAS_PTE_SPECIAL
73+
select ARCH_HAS_SCALED_CPUTIME
6874
select ARCH_HAS_SET_MEMORY
6975
select ARCH_HAS_STRICT_KERNEL_RWX
7076
select ARCH_HAS_STRICT_MODULE_RWX
@@ -111,8 +117,10 @@ config S390
111117
select ARCH_WANT_IPC_PARSE_VERSION
112118
select BUILDTIME_TABLE_SORT
113119
select CLONE_BACKWARDS2
120+
select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES
114121
select DMA_OPS if PCI
115122
select DYNAMIC_FTRACE if FUNCTION_TRACER
123+
select GENERIC_ALLOCATOR
116124
select GENERIC_CPU_AUTOPROBE
117125
select GENERIC_CPU_VULNERABILITIES
118126
select GENERIC_FIND_FIRST_BIT
@@ -126,22 +134,21 @@ config S390
126134
select HAVE_ARCH_JUMP_LABEL_RELATIVE
127135
select HAVE_ARCH_KASAN
128136
select HAVE_ARCH_KASAN_VMALLOC
129-
select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES
130137
select HAVE_ARCH_SECCOMP_FILTER
131138
select HAVE_ARCH_SOFT_DIRTY
132139
select HAVE_ARCH_TRACEHOOK
133140
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
134141
select HAVE_ARCH_VMAP_STACK
135142
select HAVE_ASM_MODVERSIONS
136-
select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
137143
select HAVE_CMPXCHG_DOUBLE
138144
select HAVE_CMPXCHG_LOCAL
139145
select HAVE_DEBUG_KMEMLEAK
140146
select HAVE_DMA_CONTIGUOUS
141147
select HAVE_DYNAMIC_FTRACE
142148
select HAVE_DYNAMIC_FTRACE_WITH_REGS
143-
select HAVE_FAST_GUP
149+
select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
144150
select HAVE_EFFICIENT_UNALIGNED_ACCESS
151+
select HAVE_FAST_GUP
145152
select HAVE_FENTRY
146153
select HAVE_FTRACE_MCOUNT_RECORD
147154
select HAVE_FUNCTION_ERROR_INJECTION
@@ -163,16 +170,15 @@ config S390
163170
select HAVE_KRETPROBES
164171
select HAVE_KVM
165172
select HAVE_LIVEPATCH
166-
select HAVE_PERF_REGS
167-
select HAVE_PERF_USER_STACK_DUMP
168173
select HAVE_MEMBLOCK_PHYS_MAP
169-
select MMU_GATHER_NO_GATHER
170174
select HAVE_MOD_ARCH_SPECIFIC
175+
select HAVE_NMI
171176
select HAVE_NOP_MCOUNT
172177
select HAVE_OPROFILE
173178
select HAVE_PCI
174179
select HAVE_PERF_EVENTS
175-
select MMU_GATHER_RCU_TABLE_FREE
180+
select HAVE_PERF_REGS
181+
select HAVE_PERF_USER_STACK_DUMP
176182
select HAVE_REGS_AND_STACK_ACCESS_API
177183
select HAVE_RELIABLE_STACKTRACE
178184
select HAVE_RSEQ
@@ -181,6 +187,8 @@ config S390
181187
select HAVE_VIRT_CPU_ACCOUNTING_IDLE
182188
select IOMMU_HELPER if PCI
183189
select IOMMU_SUPPORT if PCI
190+
select MMU_GATHER_NO_GATHER
191+
select MMU_GATHER_RCU_TABLE_FREE
184192
select MODULES_USE_ELF_RELA
185193
select NEED_DMA_MAP_STATE if PCI
186194
select NEED_SG_DMA_LENGTH if PCI
@@ -190,17 +198,12 @@ config S390
190198
select PCI_MSI if PCI
191199
select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
192200
select SPARSE_IRQ
201+
select SWIOTLB
193202
select SYSCTL_EXCEPTION_TRACE
194203
select THREAD_INFO_IN_TASK
195204
select TTY
196205
select VIRT_CPU_ACCOUNTING
197-
select ARCH_HAS_SCALED_CPUTIME
198-
select HAVE_NMI
199-
select ARCH_HAS_FORCE_DMA_UNENCRYPTED
200-
select SWIOTLB
201-
select GENERIC_ALLOCATOR
202-
imply IMA_SECURE_AND_OR_TRUSTED_BOOT
203-
206+
# Note: keep the above list sorted alphabetically
204207

205208
config SCHED_OMIT_FRAME_POINTER
206209
def_bool y

0 commit comments

Comments
 (0)