History

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

Linus Torvalds committed 5 years ago

Commit 3516bd72 parents d9296a7 129975e4 files · +35 −21Browse files

Unified · Split

4 files
  1. arch/s390/Kconfig +17 −14
  2. arch/s390/configs/debug_defconfig +9 −3
  3. arch/s390/configs/defconfig +7 −4
  4. arch/s390/configs/zfcpdump_defconfig +2 −0
arch/s390/Kconfig+17−14
@@ -54,17 +54,23 @@ config KASAN_SHADOW_OFFSET · 53 unmodified lines
54 54
55config S39055config S390
56 def_bool y56 def_bool y
57 #
58 # Note: keep this list sorted alphabetically
59 #
60 imply IMA_SECURE_AND_OR_TRUSTED_BOOT
57 select ARCH_BINFMT_ELF_STATE61 select ARCH_BINFMT_ELF_STATE
58 select ARCH_HAS_DEBUG_VM_PGTABLE62 select ARCH_HAS_DEBUG_VM_PGTABLE
59 select ARCH_HAS_DEBUG_WX63 select ARCH_HAS_DEBUG_WX
60 select ARCH_HAS_DEVMEM_IS_ALLOWED64 select ARCH_HAS_DEVMEM_IS_ALLOWED
61 select ARCH_HAS_ELF_RANDOMIZE65 select ARCH_HAS_ELF_RANDOMIZE
66 select ARCH_HAS_FORCE_DMA_UNENCRYPTED
62 select ARCH_HAS_FORTIFY_SOURCE67 select ARCH_HAS_FORTIFY_SOURCE
63 select ARCH_HAS_GCOV_PROFILE_ALL68 select ARCH_HAS_GCOV_PROFILE_ALL
64 select ARCH_HAS_GIGANTIC_PAGE69 select ARCH_HAS_GIGANTIC_PAGE
65 select ARCH_HAS_KCOV70 select ARCH_HAS_KCOV
66 select ARCH_HAS_MEM_ENCRYPT71 select ARCH_HAS_MEM_ENCRYPT
67 select ARCH_HAS_PTE_SPECIAL72 select ARCH_HAS_PTE_SPECIAL
73 select ARCH_HAS_SCALED_CPUTIME
68 select ARCH_HAS_SET_MEMORY74 select ARCH_HAS_SET_MEMORY
69 select ARCH_HAS_STRICT_KERNEL_RWX75 select ARCH_HAS_STRICT_KERNEL_RWX
70 select ARCH_HAS_STRICT_MODULE_RWX76 select ARCH_HAS_STRICT_MODULE_RWX
@@ -111,8 +117,10 @@ config S390 · 40 unmodified lines
111 select ARCH_WANT_IPC_PARSE_VERSION117 select ARCH_WANT_IPC_PARSE_VERSION
112 select BUILDTIME_TABLE_SORT118 select BUILDTIME_TABLE_SORT
113 select CLONE_BACKWARDS2119 select CLONE_BACKWARDS2
120 select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES
114 select DMA_OPS if PCI121 select DMA_OPS if PCI
115 select DYNAMIC_FTRACE if FUNCTION_TRACER122 select DYNAMIC_FTRACE if FUNCTION_TRACER
123 select GENERIC_ALLOCATOR
116 select GENERIC_CPU_AUTOPROBE124 select GENERIC_CPU_AUTOPROBE
117 select GENERIC_CPU_VULNERABILITIES125 select GENERIC_CPU_VULNERABILITIES
118 select GENERIC_FIND_FIRST_BIT126 select GENERIC_FIND_FIRST_BIT
@@ -126,22 +134,21 @@ config S390 · 7 unmodified lines
126 select HAVE_ARCH_JUMP_LABEL_RELATIVE134 select HAVE_ARCH_JUMP_LABEL_RELATIVE
127 select HAVE_ARCH_KASAN135 select HAVE_ARCH_KASAN
128 select HAVE_ARCH_KASAN_VMALLOC136 select HAVE_ARCH_KASAN_VMALLOC
129 select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES
130 select HAVE_ARCH_SECCOMP_FILTER137 select HAVE_ARCH_SECCOMP_FILTER
131 select HAVE_ARCH_SOFT_DIRTY138 select HAVE_ARCH_SOFT_DIRTY
132 select HAVE_ARCH_TRACEHOOK139 select HAVE_ARCH_TRACEHOOK
133 select HAVE_ARCH_TRANSPARENT_HUGEPAGE140 select HAVE_ARCH_TRANSPARENT_HUGEPAGE
134 select HAVE_ARCH_VMAP_STACK141 select HAVE_ARCH_VMAP_STACK
135 select HAVE_ASM_MODVERSIONS142 select HAVE_ASM_MODVERSIONS
136 select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
137 select HAVE_CMPXCHG_DOUBLE143 select HAVE_CMPXCHG_DOUBLE
138 select HAVE_CMPXCHG_LOCAL144 select HAVE_CMPXCHG_LOCAL
139 select HAVE_DEBUG_KMEMLEAK145 select HAVE_DEBUG_KMEMLEAK
140 select HAVE_DMA_CONTIGUOUS146 select HAVE_DMA_CONTIGUOUS
141 select HAVE_DYNAMIC_FTRACE147 select HAVE_DYNAMIC_FTRACE
142 select HAVE_DYNAMIC_FTRACE_WITH_REGS148 select HAVE_DYNAMIC_FTRACE_WITH_REGS
143 select HAVE_FAST_GUP149 select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
144 select HAVE_EFFICIENT_UNALIGNED_ACCESS150 select HAVE_EFFICIENT_UNALIGNED_ACCESS
151 select HAVE_FAST_GUP
145 select HAVE_FENTRY152 select HAVE_FENTRY
146 select HAVE_FTRACE_MCOUNT_RECORD153 select HAVE_FTRACE_MCOUNT_RECORD
147 select HAVE_FUNCTION_ERROR_INJECTION154 select HAVE_FUNCTION_ERROR_INJECTION
@@ -163,16 +170,15 @@ config S390 · 15 unmodified lines
163 select HAVE_KRETPROBES170 select HAVE_KRETPROBES
164 select HAVE_KVM171 select HAVE_KVM
165 select HAVE_LIVEPATCH172 select HAVE_LIVEPATCH
166 select HAVE_PERF_REGS
167 select HAVE_PERF_USER_STACK_DUMP
168 select HAVE_MEMBLOCK_PHYS_MAP173 select HAVE_MEMBLOCK_PHYS_MAP
169 select MMU_GATHER_NO_GATHER
170 select HAVE_MOD_ARCH_SPECIFIC174 select HAVE_MOD_ARCH_SPECIFIC
175 select HAVE_NMI
171 select HAVE_NOP_MCOUNT176 select HAVE_NOP_MCOUNT
172 select HAVE_OPROFILE177 select HAVE_OPROFILE
173 select HAVE_PCI178 select HAVE_PCI
174 select HAVE_PERF_EVENTS179 select HAVE_PERF_EVENTS
175 select MMU_GATHER_RCU_TABLE_FREE180 select HAVE_PERF_REGS
181 select HAVE_PERF_USER_STACK_DUMP
176 select HAVE_REGS_AND_STACK_ACCESS_API182 select HAVE_REGS_AND_STACK_ACCESS_API
177 select HAVE_RELIABLE_STACKTRACE183 select HAVE_RELIABLE_STACKTRACE
178 select HAVE_RSEQ184 select HAVE_RSEQ
@@ -181,6 +187,8 @@ config S390 · 2 unmodified lines
181 select HAVE_VIRT_CPU_ACCOUNTING_IDLE187 select HAVE_VIRT_CPU_ACCOUNTING_IDLE
182 select IOMMU_HELPER if PCI188 select IOMMU_HELPER if PCI
183 select IOMMU_SUPPORT if PCI189 select IOMMU_SUPPORT if PCI
190 select MMU_GATHER_NO_GATHER
191 select MMU_GATHER_RCU_TABLE_FREE
184 select MODULES_USE_ELF_RELA192 select MODULES_USE_ELF_RELA
185 select NEED_DMA_MAP_STATE if PCI193 select NEED_DMA_MAP_STATE if PCI
186 select NEED_SG_DMA_LENGTH if PCI194 select NEED_SG_DMA_LENGTH if PCI
@@ -190,17 +198,12 @@ config S390 · 3 unmodified lines
190 select PCI_MSI if PCI198 select PCI_MSI if PCI
191 select PCI_MSI_ARCH_FALLBACKS if PCI_MSI199 select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
192 select SPARSE_IRQ200 select SPARSE_IRQ
201 select SWIOTLB
193 select SYSCTL_EXCEPTION_TRACE202 select SYSCTL_EXCEPTION_TRACE
194 select THREAD_INFO_IN_TASK203 select THREAD_INFO_IN_TASK
195 select TTY204 select TTY
196 select VIRT_CPU_ACCOUNTING205 select VIRT_CPU_ACCOUNTING
197 select ARCH_HAS_SCALED_CPUTIME206 # Note: keep the above list sorted alphabetically
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
204 207
205config SCHED_OMIT_FRAME_POINTER208config SCHED_OMIT_FRAME_POINTER
206 def_bool y209 def_bool y
arch/s390/configs/debug_defconfig+9−3
@@ -61,7 +61,9 @@ CONFIG_OPROFILE=m · 60 unmodified lines
61CONFIG_KPROBES=y61CONFIG_KPROBES=y
62CONFIG_JUMP_LABEL=y62CONFIG_JUMP_LABEL=y
63CONFIG_STATIC_KEYS_SELFTEST=y63CONFIG_STATIC_KEYS_SELFTEST=y
64CONFIG_SECCOMP_CACHE_DEBUG=y
64CONFIG_LOCK_EVENT_COUNTS=y65CONFIG_LOCK_EVENT_COUNTS=y
66# CONFIG_GCC_PLUGINS is not set
65CONFIG_MODULES=y67CONFIG_MODULES=y
66CONFIG_MODULE_FORCE_LOAD=y68CONFIG_MODULE_FORCE_LOAD=y
67CONFIG_MODULE_UNLOAD=y69CONFIG_MODULE_UNLOAD=y
@@ -410,12 +412,12 @@ CONFIG_SCSI_ENCLOSURE=m · 342 unmodified lines
410CONFIG_SCSI_CONSTANTS=y412CONFIG_SCSI_CONSTANTS=y
411CONFIG_SCSI_LOGGING=y413CONFIG_SCSI_LOGGING=y
412CONFIG_SCSI_SPI_ATTRS=m414CONFIG_SCSI_SPI_ATTRS=m
413CONFIG_SCSI_FC_ATTRS=y415CONFIG_SCSI_FC_ATTRS=m
414CONFIG_SCSI_SAS_LIBSAS=m416CONFIG_SCSI_SAS_LIBSAS=m
415CONFIG_SCSI_SRP_ATTRS=m417CONFIG_SCSI_SRP_ATTRS=m
416CONFIG_ISCSI_TCP=m418CONFIG_ISCSI_TCP=m
417CONFIG_SCSI_DEBUG=m419CONFIG_SCSI_DEBUG=m
418CONFIG_ZFCP=y420CONFIG_ZFCP=m
419CONFIG_SCSI_VIRTIO=m421CONFIG_SCSI_VIRTIO=m
420CONFIG_SCSI_DH=y422CONFIG_SCSI_DH=y
421CONFIG_SCSI_DH_RDAC=m423CONFIG_SCSI_DH_RDAC=m
@@ -444,6 +446,7 @@ CONFIG_DM_MULTIPATH=m · 22 unmodified lines
444CONFIG_DM_MULTIPATH_QL=m446CONFIG_DM_MULTIPATH_QL=m
445CONFIG_DM_MULTIPATH_ST=m447CONFIG_DM_MULTIPATH_ST=m
446CONFIG_DM_MULTIPATH_HST=m448CONFIG_DM_MULTIPATH_HST=m
449CONFIG_DM_MULTIPATH_IOA=m
447CONFIG_DM_DELAY=m450CONFIG_DM_DELAY=m
448CONFIG_DM_UEVENT=y451CONFIG_DM_UEVENT=y
449CONFIG_DM_FLAKEY=m452CONFIG_DM_FLAKEY=m
@@ -542,7 +545,6 @@ CONFIG_INPUT_EVDEV=y · 92 unmodified lines
542# CONFIG_INPUT_MOUSE is not set545# CONFIG_INPUT_MOUSE is not set
543# CONFIG_SERIO is not set546# CONFIG_SERIO is not set
544CONFIG_LEGACY_PTY_COUNT=0547CONFIG_LEGACY_PTY_COUNT=0
545CONFIG_NULL_TTY=m
546CONFIG_VIRTIO_CONSOLE=y548CONFIG_VIRTIO_CONSOLE=y
547CONFIG_HW_RANDOM_VIRTIO=m549CONFIG_HW_RANDOM_VIRTIO=m
548CONFIG_RAW_DRIVER=m550CONFIG_RAW_DRIVER=m
@@ -574,6 +576,7 @@ CONFIG_VIRTIO_BALLOON=m · 25 unmodified lines
574CONFIG_VIRTIO_INPUT=y576CONFIG_VIRTIO_INPUT=y
575CONFIG_VHOST_NET=m577CONFIG_VHOST_NET=m
576CONFIG_VHOST_VSOCK=m578CONFIG_VHOST_VSOCK=m
579# CONFIG_SURFACE_PLATFORMS is not set
577CONFIG_S390_CCW_IOMMU=y580CONFIG_S390_CCW_IOMMU=y
578CONFIG_S390_AP_IOMMU=y581CONFIG_S390_AP_IOMMU=y
579CONFIG_EXT4_FS=y582CONFIG_EXT4_FS=y
@@ -655,6 +658,7 @@ CONFIG_CIFS_XATTR=y · 75 unmodified lines
655CONFIG_CIFS_POSIX=y658CONFIG_CIFS_POSIX=y
656# CONFIG_CIFS_DEBUG is not set659# CONFIG_CIFS_DEBUG is not set
657CONFIG_CIFS_DFS_UPCALL=y660CONFIG_CIFS_DFS_UPCALL=y
661CONFIG_CIFS_SWN_UPCALL=y
658CONFIG_NLS_DEFAULT="utf8"662CONFIG_NLS_DEFAULT="utf8"
659CONFIG_NLS_CODEPAGE_437=m663CONFIG_NLS_CODEPAGE_437=m
660CONFIG_NLS_CODEPAGE_850=m664CONFIG_NLS_CODEPAGE_850=m
@@ -826,6 +830,8 @@ CONFIG_FTRACE_SYSCALLS=y · 165 unmodified lines
826CONFIG_BLK_DEV_IO_TRACE=y830CONFIG_BLK_DEV_IO_TRACE=y
827CONFIG_BPF_KPROBE_OVERRIDE=y831CONFIG_BPF_KPROBE_OVERRIDE=y
828CONFIG_HIST_TRIGGERS=y832CONFIG_HIST_TRIGGERS=y
833CONFIG_FTRACE_STARTUP_TEST=y
834# CONFIG_EVENT_TRACE_STARTUP_TEST is not set
829CONFIG_DEBUG_USER_ASCE=y835CONFIG_DEBUG_USER_ASCE=y
830CONFIG_NOTIFIER_ERROR_INJECTION=m836CONFIG_NOTIFIER_ERROR_INJECTION=m
831CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m837CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
arch/s390/configs/defconfig+7−4
@@ -58,6 +58,7 @@ CONFIG_S390_UNWIND_SELFTEST=m · 57 unmodified lines
58CONFIG_OPROFILE=m58CONFIG_OPROFILE=m
59CONFIG_KPROBES=y59CONFIG_KPROBES=y
60CONFIG_JUMP_LABEL=y60CONFIG_JUMP_LABEL=y
61# CONFIG_GCC_PLUGINS is not set
61CONFIG_MODULES=y62CONFIG_MODULES=y
62CONFIG_MODULE_FORCE_LOAD=y63CONFIG_MODULE_FORCE_LOAD=y
63CONFIG_MODULE_UNLOAD=y64CONFIG_MODULE_UNLOAD=y
@@ -95,7 +96,6 @@ CONFIG_ZSMALLOC_STAT=y · 31 unmodified lines
95CONFIG_DEFERRED_STRUCT_PAGE_INIT=y96CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
96CONFIG_IDLE_PAGE_TRACKING=y97CONFIG_IDLE_PAGE_TRACKING=y
97CONFIG_PERCPU_STATS=y98CONFIG_PERCPU_STATS=y
98CONFIG_GUP_TEST=y
99CONFIG_NET=y99CONFIG_NET=y
100CONFIG_PACKET=y100CONFIG_PACKET=y
101CONFIG_PACKET_DIAG=m101CONFIG_PACKET_DIAG=m
@@ -403,12 +403,12 @@ CONFIG_SCSI_ENCLOSURE=m · 301 unmodified lines
403CONFIG_SCSI_CONSTANTS=y403CONFIG_SCSI_CONSTANTS=y
404CONFIG_SCSI_LOGGING=y404CONFIG_SCSI_LOGGING=y
405CONFIG_SCSI_SPI_ATTRS=m405CONFIG_SCSI_SPI_ATTRS=m
406CONFIG_SCSI_FC_ATTRS=y406CONFIG_SCSI_FC_ATTRS=m
407CONFIG_SCSI_SAS_LIBSAS=m407CONFIG_SCSI_SAS_LIBSAS=m
408CONFIG_SCSI_SRP_ATTRS=m408CONFIG_SCSI_SRP_ATTRS=m
409CONFIG_ISCSI_TCP=m409CONFIG_ISCSI_TCP=m
410CONFIG_SCSI_DEBUG=m410CONFIG_SCSI_DEBUG=m
411CONFIG_ZFCP=y411CONFIG_ZFCP=m
412CONFIG_SCSI_VIRTIO=m412CONFIG_SCSI_VIRTIO=m
413CONFIG_SCSI_DH=y413CONFIG_SCSI_DH=y
414CONFIG_SCSI_DH_RDAC=m414CONFIG_SCSI_DH_RDAC=m
@@ -437,6 +437,7 @@ CONFIG_DM_MULTIPATH=m · 22 unmodified lines
437CONFIG_DM_MULTIPATH_QL=m437CONFIG_DM_MULTIPATH_QL=m
438CONFIG_DM_MULTIPATH_ST=m438CONFIG_DM_MULTIPATH_ST=m
439CONFIG_DM_MULTIPATH_HST=m439CONFIG_DM_MULTIPATH_HST=m
440CONFIG_DM_MULTIPATH_IOA=m
440CONFIG_DM_DELAY=m441CONFIG_DM_DELAY=m
441CONFIG_DM_UEVENT=y442CONFIG_DM_UEVENT=y
442CONFIG_DM_FLAKEY=m443CONFIG_DM_FLAKEY=m
@@ -536,7 +537,6 @@ CONFIG_INPUT_EVDEV=y · 93 unmodified lines
536# CONFIG_INPUT_MOUSE is not set537# CONFIG_INPUT_MOUSE is not set
537# CONFIG_SERIO is not set538# CONFIG_SERIO is not set
538CONFIG_LEGACY_PTY_COUNT=0539CONFIG_LEGACY_PTY_COUNT=0
539CONFIG_NULL_TTY=m
540CONFIG_VIRTIO_CONSOLE=y540CONFIG_VIRTIO_CONSOLE=y
541CONFIG_HW_RANDOM_VIRTIO=m541CONFIG_HW_RANDOM_VIRTIO=m
542CONFIG_RAW_DRIVER=m542CONFIG_RAW_DRIVER=m
@@ -568,6 +568,7 @@ CONFIG_VIRTIO_BALLOON=m · 25 unmodified lines
568CONFIG_VIRTIO_INPUT=y568CONFIG_VIRTIO_INPUT=y
569CONFIG_VHOST_NET=m569CONFIG_VHOST_NET=m
570CONFIG_VHOST_VSOCK=m570CONFIG_VHOST_VSOCK=m
571# CONFIG_SURFACE_PLATFORMS is not set
571CONFIG_S390_CCW_IOMMU=y572CONFIG_S390_CCW_IOMMU=y
572CONFIG_S390_AP_IOMMU=y573CONFIG_S390_AP_IOMMU=y
573CONFIG_EXT4_FS=y574CONFIG_EXT4_FS=y
@@ -645,6 +646,7 @@ CONFIG_CIFS_XATTR=y · 71 unmodified lines
645CONFIG_CIFS_POSIX=y646CONFIG_CIFS_POSIX=y
646# CONFIG_CIFS_DEBUG is not set647# CONFIG_CIFS_DEBUG is not set
647CONFIG_CIFS_DFS_UPCALL=y648CONFIG_CIFS_DFS_UPCALL=y
649CONFIG_CIFS_SWN_UPCALL=y
648CONFIG_NLS_DEFAULT="utf8"650CONFIG_NLS_DEFAULT="utf8"
649CONFIG_NLS_CODEPAGE_437=m651CONFIG_NLS_CODEPAGE_437=m
650CONFIG_NLS_CODEPAGE_850=m652CONFIG_NLS_CODEPAGE_850=m
@@ -778,6 +780,7 @@ CONFIG_FTRACE_SYSCALLS=y · 127 unmodified lines
778CONFIG_BLK_DEV_IO_TRACE=y780CONFIG_BLK_DEV_IO_TRACE=y
779CONFIG_BPF_KPROBE_OVERRIDE=y781CONFIG_BPF_KPROBE_OVERRIDE=y
780CONFIG_HIST_TRIGGERS=y782CONFIG_HIST_TRIGGERS=y
783CONFIG_DEBUG_USER_ASCE=y
781CONFIG_LKDTM=m784CONFIG_LKDTM=m
782CONFIG_PERCPU_TEST=m785CONFIG_PERCPU_TEST=m
783CONFIG_ATOMIC64_SELFTEST=y786CONFIG_ATOMIC64_SELFTEST=y
arch/s390/configs/zfcpdump_defconfig+2−0
@@ -22,6 +22,7 @@ CONFIG_CRASH_DUMP=y · 21 unmodified lines
22# CONFIG_VIRTUALIZATION is not set22# CONFIG_VIRTUALIZATION is not set
23# CONFIG_S390_GUEST is not set23# CONFIG_S390_GUEST is not set
24# CONFIG_SECCOMP is not set24# CONFIG_SECCOMP is not set
25# CONFIG_GCC_PLUGINS is not set
25CONFIG_PARTITION_ADVANCED=y26CONFIG_PARTITION_ADVANCED=y
26CONFIG_IBM_PARTITION=y27CONFIG_IBM_PARTITION=y
27# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set28# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -58,6 +59,7 @@ CONFIG_RAW_DRIVER=y · 30 unmodified lines
58# CONFIG_HID is not set59# CONFIG_HID is not set
59# CONFIG_VIRTIO_MENU is not set60# CONFIG_VIRTIO_MENU is not set
60# CONFIG_VHOST_MENU is not set61# CONFIG_VHOST_MENU is not set
62# CONFIG_SURFACE_PLATFORMS is not set
61# CONFIG_IOMMU_SUPPORT is not set63# CONFIG_IOMMU_SUPPORT is not set
62# CONFIG_DNOTIFY is not set64# CONFIG_DNOTIFY is not set
63# CONFIG_INOTIFY_USER is not set65# CONFIG_INOTIFY_USER is not set