Skip to content

Commit 3516bd7

Browse files
committed
Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 cleanups from Vasily Gorbik: "Update defconfigs and sort config select list" * tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/Kconfig: sort config S390 select list once again s390: update defconfigs
2 parents d9296a7 + 129975e commit 3516bd7

File tree

4 files changed

+35
-21
lines changed

4 files changed

+35
-21
lines changed

arch/s390/Kconfig

+17-14
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

arch/s390/configs/debug_defconfig

+9-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ CONFIG_OPROFILE=m
6161
CONFIG_KPROBES=y
6262
CONFIG_JUMP_LABEL=y
6363
CONFIG_STATIC_KEYS_SELFTEST=y
64+
CONFIG_SECCOMP_CACHE_DEBUG=y
6465
CONFIG_LOCK_EVENT_COUNTS=y
66+
# CONFIG_GCC_PLUGINS is not set
6567
CONFIG_MODULES=y
6668
CONFIG_MODULE_FORCE_LOAD=y
6769
CONFIG_MODULE_UNLOAD=y
@@ -410,12 +412,12 @@ CONFIG_SCSI_ENCLOSURE=m
410412
CONFIG_SCSI_CONSTANTS=y
411413
CONFIG_SCSI_LOGGING=y
412414
CONFIG_SCSI_SPI_ATTRS=m
413-
CONFIG_SCSI_FC_ATTRS=y
415+
CONFIG_SCSI_FC_ATTRS=m
414416
CONFIG_SCSI_SAS_LIBSAS=m
415417
CONFIG_SCSI_SRP_ATTRS=m
416418
CONFIG_ISCSI_TCP=m
417419
CONFIG_SCSI_DEBUG=m
418-
CONFIG_ZFCP=y
420+
CONFIG_ZFCP=m
419421
CONFIG_SCSI_VIRTIO=m
420422
CONFIG_SCSI_DH=y
421423
CONFIG_SCSI_DH_RDAC=m
@@ -444,6 +446,7 @@ CONFIG_DM_MULTIPATH=m
444446
CONFIG_DM_MULTIPATH_QL=m
445447
CONFIG_DM_MULTIPATH_ST=m
446448
CONFIG_DM_MULTIPATH_HST=m
449+
CONFIG_DM_MULTIPATH_IOA=m
447450
CONFIG_DM_DELAY=m
448451
CONFIG_DM_UEVENT=y
449452
CONFIG_DM_FLAKEY=m
@@ -542,7 +545,6 @@ CONFIG_INPUT_EVDEV=y
542545
# CONFIG_INPUT_MOUSE is not set
543546
# CONFIG_SERIO is not set
544547
CONFIG_LEGACY_PTY_COUNT=0
545-
CONFIG_NULL_TTY=m
546548
CONFIG_VIRTIO_CONSOLE=y
547549
CONFIG_HW_RANDOM_VIRTIO=m
548550
CONFIG_RAW_DRIVER=m
@@ -574,6 +576,7 @@ CONFIG_VIRTIO_BALLOON=m
574576
CONFIG_VIRTIO_INPUT=y
575577
CONFIG_VHOST_NET=m
576578
CONFIG_VHOST_VSOCK=m
579+
# CONFIG_SURFACE_PLATFORMS is not set
577580
CONFIG_S390_CCW_IOMMU=y
578581
CONFIG_S390_AP_IOMMU=y
579582
CONFIG_EXT4_FS=y
@@ -655,6 +658,7 @@ CONFIG_CIFS_XATTR=y
655658
CONFIG_CIFS_POSIX=y
656659
# CONFIG_CIFS_DEBUG is not set
657660
CONFIG_CIFS_DFS_UPCALL=y
661+
CONFIG_CIFS_SWN_UPCALL=y
658662
CONFIG_NLS_DEFAULT="utf8"
659663
CONFIG_NLS_CODEPAGE_437=m
660664
CONFIG_NLS_CODEPAGE_850=m
@@ -826,6 +830,8 @@ CONFIG_FTRACE_SYSCALLS=y
826830
CONFIG_BLK_DEV_IO_TRACE=y
827831
CONFIG_BPF_KPROBE_OVERRIDE=y
828832
CONFIG_HIST_TRIGGERS=y
833+
CONFIG_FTRACE_STARTUP_TEST=y
834+
# CONFIG_EVENT_TRACE_STARTUP_TEST is not set
829835
CONFIG_DEBUG_USER_ASCE=y
830836
CONFIG_NOTIFIER_ERROR_INJECTION=m
831837
CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m

arch/s390/configs/defconfig

+7-4
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ CONFIG_S390_UNWIND_SELFTEST=m
5858
CONFIG_OPROFILE=m
5959
CONFIG_KPROBES=y
6060
CONFIG_JUMP_LABEL=y
61+
# CONFIG_GCC_PLUGINS is not set
6162
CONFIG_MODULES=y
6263
CONFIG_MODULE_FORCE_LOAD=y
6364
CONFIG_MODULE_UNLOAD=y
@@ -95,7 +96,6 @@ CONFIG_ZSMALLOC_STAT=y
9596
CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
9697
CONFIG_IDLE_PAGE_TRACKING=y
9798
CONFIG_PERCPU_STATS=y
98-
CONFIG_GUP_TEST=y
9999
CONFIG_NET=y
100100
CONFIG_PACKET=y
101101
CONFIG_PACKET_DIAG=m
@@ -403,12 +403,12 @@ CONFIG_SCSI_ENCLOSURE=m
403403
CONFIG_SCSI_CONSTANTS=y
404404
CONFIG_SCSI_LOGGING=y
405405
CONFIG_SCSI_SPI_ATTRS=m
406-
CONFIG_SCSI_FC_ATTRS=y
406+
CONFIG_SCSI_FC_ATTRS=m
407407
CONFIG_SCSI_SAS_LIBSAS=m
408408
CONFIG_SCSI_SRP_ATTRS=m
409409
CONFIG_ISCSI_TCP=m
410410
CONFIG_SCSI_DEBUG=m
411-
CONFIG_ZFCP=y
411+
CONFIG_ZFCP=m
412412
CONFIG_SCSI_VIRTIO=m
413413
CONFIG_SCSI_DH=y
414414
CONFIG_SCSI_DH_RDAC=m
@@ -437,6 +437,7 @@ CONFIG_DM_MULTIPATH=m
437437
CONFIG_DM_MULTIPATH_QL=m
438438
CONFIG_DM_MULTIPATH_ST=m
439439
CONFIG_DM_MULTIPATH_HST=m
440+
CONFIG_DM_MULTIPATH_IOA=m
440441
CONFIG_DM_DELAY=m
441442
CONFIG_DM_UEVENT=y
442443
CONFIG_DM_FLAKEY=m
@@ -536,7 +537,6 @@ CONFIG_INPUT_EVDEV=y
536537
# CONFIG_INPUT_MOUSE is not set
537538
# CONFIG_SERIO is not set
538539
CONFIG_LEGACY_PTY_COUNT=0
539-
CONFIG_NULL_TTY=m
540540
CONFIG_VIRTIO_CONSOLE=y
541541
CONFIG_HW_RANDOM_VIRTIO=m
542542
CONFIG_RAW_DRIVER=m
@@ -568,6 +568,7 @@ CONFIG_VIRTIO_BALLOON=m
568568
CONFIG_VIRTIO_INPUT=y
569569
CONFIG_VHOST_NET=m
570570
CONFIG_VHOST_VSOCK=m
571+
# CONFIG_SURFACE_PLATFORMS is not set
571572
CONFIG_S390_CCW_IOMMU=y
572573
CONFIG_S390_AP_IOMMU=y
573574
CONFIG_EXT4_FS=y
@@ -645,6 +646,7 @@ CONFIG_CIFS_XATTR=y
645646
CONFIG_CIFS_POSIX=y
646647
# CONFIG_CIFS_DEBUG is not set
647648
CONFIG_CIFS_DFS_UPCALL=y
649+
CONFIG_CIFS_SWN_UPCALL=y
648650
CONFIG_NLS_DEFAULT="utf8"
649651
CONFIG_NLS_CODEPAGE_437=m
650652
CONFIG_NLS_CODEPAGE_850=m
@@ -778,6 +780,7 @@ CONFIG_FTRACE_SYSCALLS=y
778780
CONFIG_BLK_DEV_IO_TRACE=y
779781
CONFIG_BPF_KPROBE_OVERRIDE=y
780782
CONFIG_HIST_TRIGGERS=y
783+
CONFIG_DEBUG_USER_ASCE=y
781784
CONFIG_LKDTM=m
782785
CONFIG_PERCPU_TEST=m
783786
CONFIG_ATOMIC64_SELFTEST=y

arch/s390/configs/zfcpdump_defconfig

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ CONFIG_CRASH_DUMP=y
2222
# CONFIG_VIRTUALIZATION is not set
2323
# CONFIG_S390_GUEST is not set
2424
# CONFIG_SECCOMP is not set
25+
# CONFIG_GCC_PLUGINS is not set
2526
CONFIG_PARTITION_ADVANCED=y
2627
CONFIG_IBM_PARTITION=y
2728
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -58,6 +59,7 @@ CONFIG_RAW_DRIVER=y
5859
# CONFIG_HID is not set
5960
# CONFIG_VIRTIO_MENU is not set
6061
# CONFIG_VHOST_MENU is not set
62+
# CONFIG_SURFACE_PLATFORMS is not set
6163
# CONFIG_IOMMU_SUPPORT is not set
6264
# CONFIG_DNOTIFY is not set
6365
# CONFIG_INOTIFY_USER is not set

0 commit comments

Comments
 (0)