@@ -125,8 +125,8 @@ config S390
125125 select ARCH_WANTS_DYNAMIC_TASK_STRUCT
126126 select ARCH_WANTS_NO_INSTR
127127 select ARCH_WANT_DEFAULT_BPF_JIT
128- select ARCH_WANT_IPC_PARSE_VERSION
129128 select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP
129+ select ARCH_WANT_IPC_PARSE_VERSION
130130 select BUILDTIME_TABLE_SORT
131131 select CLONE_BACKWARDS2
132132 select DMA_OPS if PCI
@@ -187,7 +187,6 @@ config S390
187187 select HAVE_KPROBES
188188 select HAVE_KPROBES_ON_FTRACE
189189 select HAVE_KRETPROBES
190- select HAVE_RETHOOK
191190 select HAVE_KVM
192191 select HAVE_LIVEPATCH
193192 select HAVE_MEMBLOCK_PHYS_MAP
@@ -200,6 +199,7 @@ config S390
200199 select HAVE_PERF_USER_STACK_DUMP
201200 select HAVE_REGS_AND_STACK_ACCESS_API
202201 select HAVE_RELIABLE_STACKTRACE
202+ select HAVE_RETHOOK
203203 select HAVE_RSEQ
204204 select HAVE_SAMPLE_FTRACE_DIRECT
205205 select HAVE_SAMPLE_FTRACE_DIRECT_MULTI
@@ -210,9 +210,9 @@ config S390
210210 select HAVE_VIRT_CPU_ACCOUNTING_IDLE
211211 select IOMMU_HELPER if PCI
212212 select IOMMU_SUPPORT if PCI
213+ select MMU_GATHER_MERGE_VMAS
213214 select MMU_GATHER_NO_GATHER
214215 select MMU_GATHER_RCU_TABLE_FREE
215- select MMU_GATHER_MERGE_VMAS
216216 select MODULES_USE_ELF_RELA
217217 select NEED_DMA_MAP_STATE if PCI
218218 select NEED_PER_CPU_EMBED_FIRST_CHUNK
0 commit comments