s390/Kconfig: sort list of arch selected config options

Just like on other architectures. The intention is that this will reduce
merge conflicts if new config options get added in sorted order as well.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b5ea38c2564753df883026f83fece8ab484df68c..17775cf15348ace0302920de7562ebf23f59c655 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -60,86 +60,87 @@ config PCI_QUIRKS
 
 config S390
        def_bool y
-       select USE_GENERIC_SMP_HELPERS if SMP
-       select GENERIC_CPU_DEVICES if !SMP
-       select HAVE_SYSCALL_WRAPPERS
-       select HAVE_FUNCTION_TRACER
-       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       select HAVE_FTRACE_MCOUNT_RECORD
-       select HAVE_C_RECORDMCOUNT
-       select HAVE_SYSCALL_TRACEPOINTS
-       select SYSCTL_EXCEPTION_TRACE
-       select HAVE_DYNAMIC_FTRACE
-       select HAVE_FUNCTION_GRAPH_TRACER
-       select HAVE_REGS_AND_STACK_ACCESS_API
-       select HAVE_OPROFILE
-       select HAVE_KPROBES
-       select HAVE_KRETPROBES
-       select HAVE_KVM if 64BIT
-       select HAVE_ARCH_TRACEHOOK
-       select INIT_ALL_POSSIBLE
-       select HAVE_IRQ_WORK
-       select HAVE_PERF_EVENTS
-       select ARCH_HAVE_NMI_SAFE_CMPXCHG
-       select HAVE_DEBUG_KMEMLEAK
-       select HAVE_KERNEL_GZIP
-       select HAVE_KERNEL_BZIP2
-       select HAVE_KERNEL_LZMA
-       select HAVE_KERNEL_LZO
-       select HAVE_KERNEL_XZ
-       select HAVE_ARCH_MUTEX_CPU_RELAX
-       select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
-       select HAVE_BPF_JIT if 64BIT && PACK_STACK
-       select ARCH_SAVE_PAGE_KEYS if HIBERNATION
-       select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-       select HAVE_MEMBLOCK
-       select HAVE_MEMBLOCK_NODE_MAP
-       select HAVE_CMPXCHG_LOCAL
-       select HAVE_CMPXCHG_DOUBLE
-       select HAVE_ALIGNED_STRUCT_PAGE if SLUB
-       select HAVE_VIRT_CPU_ACCOUNTING
-       select VIRT_CPU_ACCOUNTING
        select ARCH_DISCARD_MEMBLOCK
-       select BUILDTIME_EXTABLE_SORT
-       select ARCH_INLINE_SPIN_TRYLOCK
-       select ARCH_INLINE_SPIN_TRYLOCK_BH
-       select ARCH_INLINE_SPIN_LOCK
-       select ARCH_INLINE_SPIN_LOCK_BH
-       select ARCH_INLINE_SPIN_LOCK_IRQ
-       select ARCH_INLINE_SPIN_LOCK_IRQSAVE
-       select ARCH_INLINE_SPIN_UNLOCK
-       select ARCH_INLINE_SPIN_UNLOCK_BH
-       select ARCH_INLINE_SPIN_UNLOCK_IRQ
-       select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
-       select ARCH_INLINE_READ_TRYLOCK
+       select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+       select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_INLINE_READ_LOCK
        select ARCH_INLINE_READ_LOCK_BH
        select ARCH_INLINE_READ_LOCK_IRQ
        select ARCH_INLINE_READ_LOCK_IRQSAVE
+       select ARCH_INLINE_READ_TRYLOCK
        select ARCH_INLINE_READ_UNLOCK
        select ARCH_INLINE_READ_UNLOCK_BH
        select ARCH_INLINE_READ_UNLOCK_IRQ
        select ARCH_INLINE_READ_UNLOCK_IRQRESTORE
-       select ARCH_INLINE_WRITE_TRYLOCK
+       select ARCH_INLINE_SPIN_LOCK
+       select ARCH_INLINE_SPIN_LOCK_BH
+       select ARCH_INLINE_SPIN_LOCK_IRQ
+       select ARCH_INLINE_SPIN_LOCK_IRQSAVE
+       select ARCH_INLINE_SPIN_TRYLOCK
+       select ARCH_INLINE_SPIN_TRYLOCK_BH
+       select ARCH_INLINE_SPIN_UNLOCK
+       select ARCH_INLINE_SPIN_UNLOCK_BH
+       select ARCH_INLINE_SPIN_UNLOCK_IRQ
+       select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
        select ARCH_INLINE_WRITE_LOCK
        select ARCH_INLINE_WRITE_LOCK_BH
        select ARCH_INLINE_WRITE_LOCK_IRQ
        select ARCH_INLINE_WRITE_LOCK_IRQSAVE
+       select ARCH_INLINE_WRITE_TRYLOCK
        select ARCH_INLINE_WRITE_UNLOCK
        select ARCH_INLINE_WRITE_UNLOCK_BH
        select ARCH_INLINE_WRITE_UNLOCK_IRQ
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
-       select HAVE_UID16 if 32BIT
+       select ARCH_SAVE_PAGE_KEYS if HIBERNATION
        select ARCH_WANT_IPC_PARSE_VERSION
-       select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
+       select BUILDTIME_EXTABLE_SORT
+       select CLONE_BACKWARDS2
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_CPU_DEVICES if !SMP
+       select GENERIC_KERNEL_THREAD
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL_OLD
-       select GENERIC_CLOCKEVENTS
-       select KTIME_SCALAR if 32BIT
+       select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+       select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
+       select HAVE_ARCH_MUTEX_CPU_RELAX
        select HAVE_ARCH_SECCOMP_FILTER
+       select HAVE_ARCH_TRACEHOOK
+       select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT
+       select HAVE_BPF_JIT if 64BIT && PACK_STACK
+       select HAVE_CMPXCHG_DOUBLE
+       select HAVE_CMPXCHG_LOCAL
+       select HAVE_C_RECORDMCOUNT
+       select HAVE_DEBUG_KMEMLEAK
+       select HAVE_DYNAMIC_FTRACE
+       select HAVE_FTRACE_MCOUNT_RECORD
+       select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+       select HAVE_IRQ_WORK
+       select HAVE_KERNEL_BZIP2
+       select HAVE_KERNEL_GZIP
+       select HAVE_KERNEL_LZMA
+       select HAVE_KERNEL_LZO
+       select HAVE_KERNEL_XZ
+       select HAVE_KPROBES
+       select HAVE_KRETPROBES
+       select HAVE_KVM if 64BIT
+       select HAVE_MEMBLOCK
+       select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_MOD_ARCH_SPECIFIC
+       select HAVE_OPROFILE
+       select HAVE_PERF_EVENTS
+       select HAVE_REGS_AND_STACK_ACCESS_API
+       select HAVE_SYSCALL_TRACEPOINTS
+       select HAVE_SYSCALL_WRAPPERS
+       select HAVE_UID16 if 32BIT
+       select HAVE_VIRT_CPU_ACCOUNTING
+       select INIT_ALL_POSSIBLE
+       select KTIME_SCALAR if 32BIT
        select MODULES_USE_ELF_RELA
-       select CLONE_BACKWARDS2
+       select SYSCTL_EXCEPTION_TRACE
+       select USE_GENERIC_SMP_HELPERS if SMP
+       select VIRT_CPU_ACCOUNTING
 
 config SCHED_OMIT_FRAME_POINTER
        def_bool y