Commit c6b05f4e authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC 



Commit a7d2475a ("powerpc: Sort the selects under CONFIG_PPC")
sorted all selects under CONFIG_PPC.

4 years later, several items have been introduced at wrong place,
a few other have been renamed without moving them to their correct
place.

Reorder them now.

While we are at it, simplify the test for a couple of them:
- PPC_64 && PPC_PSERIES is simplified in PPC_PSERIES
- PPC_64 && PPC_BOOK3S is simplified in PPC_BOOK3S_64

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/361ee3fc5009c709ae0ca592249bb0702c6ef073.1619024780.git.christophe.leroy@csgroup.eu
parent f5668260

arch/powerpc/Kconfig

+17 −17
Original line number Diff line number Diff line
@@ -118,28 +118,29 @@ config PPC 
	# Please keep this list sorted alphabetically.

	#

	select ARCH_32BIT_OFF_T if PPC32

	select ARCH_HAS_COPY_MC			if PPC64

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_MAP_DIRECT 		if PPC_PSERIES

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_KCOV

	select ARCH_HAS_HUGEPD			if HUGETLB_PAGE

	select ARCH_HAS_KCOV

	select ARCH_HAS_MEMBARRIER_CALLBACKS

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_MEMREMAP_COMPAT_ALIGN

	select ARCH_HAS_MMIOWB			if PPC64

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PMEM_API

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PTE_DEVMAP		if PPC_BOOK3S_64

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_MEMBARRIER_CALLBACKS

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64

	select ARCH_HAS_STRICT_KERNEL_RWX	if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION)

	select ARCH_HAS_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UACCESS_FLUSHCACHE

	select ARCH_HAS_COPY_MC			if PPC64

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_KEEP_MEMBLOCK
@@ -162,9 +163,8 @@ config PPC 
	select BUILDTIME_TABLE_SORT

	select CLONE_BACKWARDS

	select DCACHE_WORD_ACCESS		if PPC64 && CPU_LITTLE_ENDIAN

	select DMA_OPS				if PPC64

	select DMA_OPS_BYPASS			if PPC64

	select ARCH_HAS_DMA_MAP_DIRECT 		if PPC64 && PPC_PSERIES

	select DMA_OPS				if PPC64

	select DYNAMIC_FTRACE			if FUNCTION_TRACER

	select EDAC_ATOMIC_SCRUB

	select EDAC_SUPPORT
@@ -190,18 +190,16 @@ config PPC 
	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN			if PPC32 && PPC_PAGE_SHIFT <= 14

	select HAVE_ARCH_KASAN_VMALLOC		if PPC32 && PPC_PAGE_SHIFT <= 14

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KFENCE			if PPC32

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_MMAP_RND_BITS

	select HAVE_ARCH_MMAP_RND_COMPAT_BITS	if COMPAT

	select HAVE_ARCH_NVRAM_OPS

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ASM_MODVERSIONS

	select HAVE_C_RECORDMCOUNT

	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)

	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)

	select HAVE_CONTEXT_TRACKING		if PPC64

	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_DYNAMIC_FTRACE
@@ -215,10 +213,13 @@ config PPC 
	select HAVE_FUNCTION_TRACER

	select HAVE_GCC_PLUGINS			if GCC_VERSION >= 50200   # plugin support on gcc <= 5.1 is buggy on PPC

	select HAVE_GENERIC_VDSO

	select HAVE_HARDLOCKUP_DETECTOR_ARCH	if PPC_BOOK3S_64 && SMP

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_HW_BREAKPOINT		if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)

	select HAVE_IDE

	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA			if DEFAULT_UIMAGE

	select HAVE_KERNEL_LZO			if DEFAULT_UIMAGE
@@ -230,25 +231,24 @@ config PPC 
	select HAVE_LIVEPATCH			if HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI				if PERF_EVENTS || (PPC64 && PPC_BOOK3S)

	select HAVE_HARDLOCKUP_DETECTOR_ARCH	if PPC64 && PPC_BOOK3S && SMP

	select HAVE_OPTPROBES

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI		if PPC64

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select MMU_GATHER_RCU_TABLE_FREE

	select MMU_GATHER_PAGE_SIZE

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RELIABLE_STACKTRACE

	select HAVE_RSEQ

	select HAVE_SOFTIRQ_ON_OWN_STACK

	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)

	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_RSEQ

	select IOMMU_HELPER			if PPC64

	select IRQ_DOMAIN

	select IRQ_FORCED_THREADING

	select MMU_GATHER_PAGE_SIZE

	select MMU_GATHER_RCU_TABLE_FREE

	select MODULES_USE_ELF_RELA

	select NEED_DMA_MAP_STATE		if PPC64 || NOT_COHERENT_CACHE

	select NEED_SG_DMA_LENGTH