Skip to content

Commit c6b05f4

Browse files
chleroympe
authored andcommitted
powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC
Commit a7d2475 ("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: Christophe Leroy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/361ee3fc5009c709ae0ca592249bb0702c6ef073.1619024780.git.christophe.leroy@csgroup.eu
1 parent f566826 commit c6b05f4

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

arch/powerpc/Kconfig

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -118,28 +118,29 @@ config PPC
118118
# Please keep this list sorted alphabetically.
119119
#
120120
select ARCH_32BIT_OFF_T if PPC32
121+
select ARCH_HAS_COPY_MC if PPC64
121122
select ARCH_HAS_DEBUG_VIRTUAL
122123
select ARCH_HAS_DEBUG_VM_PGTABLE
123124
select ARCH_HAS_DEVMEM_IS_ALLOWED
125+
select ARCH_HAS_DMA_MAP_DIRECT if PPC_PSERIES
124126
select ARCH_HAS_ELF_RANDOMIZE
125127
select ARCH_HAS_FORTIFY_SOURCE
126128
select ARCH_HAS_GCOV_PROFILE_ALL
127-
select ARCH_HAS_KCOV
128129
select ARCH_HAS_HUGEPD if HUGETLB_PAGE
130+
select ARCH_HAS_KCOV
131+
select ARCH_HAS_MEMBARRIER_CALLBACKS
132+
select ARCH_HAS_MEMBARRIER_SYNC_CORE
129133
select ARCH_HAS_MEMREMAP_COMPAT_ALIGN
130134
select ARCH_HAS_MMIOWB if PPC64
135+
select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
131136
select ARCH_HAS_PHYS_TO_DMA
132137
select ARCH_HAS_PMEM_API
133-
select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
134138
select ARCH_HAS_PTE_DEVMAP if PPC_BOOK3S_64
135139
select ARCH_HAS_PTE_SPECIAL
136-
select ARCH_HAS_MEMBARRIER_CALLBACKS
137-
select ARCH_HAS_MEMBARRIER_SYNC_CORE
138140
select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64
139141
select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION)
140142
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
141143
select ARCH_HAS_UACCESS_FLUSHCACHE
142-
select ARCH_HAS_COPY_MC if PPC64
143144
select ARCH_HAS_UBSAN_SANITIZE_ALL
144145
select ARCH_HAVE_NMI_SAFE_CMPXCHG
145146
select ARCH_KEEP_MEMBLOCK
@@ -162,9 +163,8 @@ config PPC
162163
select BUILDTIME_TABLE_SORT
163164
select CLONE_BACKWARDS
164165
select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
165-
select DMA_OPS if PPC64
166166
select DMA_OPS_BYPASS if PPC64
167-
select ARCH_HAS_DMA_MAP_DIRECT if PPC64 && PPC_PSERIES
167+
select DMA_OPS if PPC64
168168
select DYNAMIC_FTRACE if FUNCTION_TRACER
169169
select EDAC_ATOMIC_SCRUB
170170
select EDAC_SUPPORT
@@ -190,18 +190,16 @@ config PPC
190190
select HAVE_ARCH_JUMP_LABEL_RELATIVE
191191
select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14
192192
select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14
193-
select HAVE_ARCH_KGDB
194193
select HAVE_ARCH_KFENCE if PPC32
194+
select HAVE_ARCH_KGDB
195195
select HAVE_ARCH_MMAP_RND_BITS
196196
select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT
197197
select HAVE_ARCH_NVRAM_OPS
198198
select HAVE_ARCH_SECCOMP_FILTER
199199
select HAVE_ARCH_TRACEHOOK
200200
select HAVE_ASM_MODVERSIONS
201-
select HAVE_C_RECORDMCOUNT
202-
select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
203-
select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
204201
select HAVE_CONTEXT_TRACKING if PPC64
202+
select HAVE_C_RECORDMCOUNT
205203
select HAVE_DEBUG_KMEMLEAK
206204
select HAVE_DEBUG_STACKOVERFLOW
207205
select HAVE_DYNAMIC_FTRACE
@@ -215,10 +213,13 @@ config PPC
215213
select HAVE_FUNCTION_TRACER
216214
select HAVE_GCC_PLUGINS if GCC_VERSION >= 50200 # plugin support on gcc <= 5.1 is buggy on PPC
217215
select HAVE_GENERIC_VDSO
216+
select HAVE_HARDLOCKUP_DETECTOR_ARCH if PPC_BOOK3S_64 && SMP
217+
select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH
218218
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
219219
select HAVE_IDE
220220
select HAVE_IOREMAP_PROT
221221
select HAVE_IRQ_EXIT_ON_IRQ_STACK
222+
select HAVE_IRQ_TIME_ACCOUNTING
222223
select HAVE_KERNEL_GZIP
223224
select HAVE_KERNEL_LZMA if DEFAULT_UIMAGE
224225
select HAVE_KERNEL_LZO if DEFAULT_UIMAGE
@@ -230,25 +231,24 @@ config PPC
230231
select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
231232
select HAVE_MOD_ARCH_SPECIFIC
232233
select HAVE_NMI if PERF_EVENTS || (PPC64 && PPC_BOOK3S)
233-
select HAVE_HARDLOCKUP_DETECTOR_ARCH if PPC64 && PPC_BOOK3S && SMP
234234
select HAVE_OPTPROBES
235235
select HAVE_PERF_EVENTS
236236
select HAVE_PERF_EVENTS_NMI if PPC64
237-
select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH
238237
select HAVE_PERF_REGS
239238
select HAVE_PERF_USER_STACK_DUMP
240-
select MMU_GATHER_RCU_TABLE_FREE
241-
select MMU_GATHER_PAGE_SIZE
242239
select HAVE_REGS_AND_STACK_ACCESS_API
243240
select HAVE_RELIABLE_STACKTRACE
241+
select HAVE_RSEQ
244242
select HAVE_SOFTIRQ_ON_OWN_STACK
243+
select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
244+
select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
245245
select HAVE_SYSCALL_TRACEPOINTS
246246
select HAVE_VIRT_CPU_ACCOUNTING
247-
select HAVE_IRQ_TIME_ACCOUNTING
248-
select HAVE_RSEQ
249247
select IOMMU_HELPER if PPC64
250248
select IRQ_DOMAIN
251249
select IRQ_FORCED_THREADING
250+
select MMU_GATHER_PAGE_SIZE
251+
select MMU_GATHER_RCU_TABLE_FREE
252252
select MODULES_USE_ELF_RELA
253253
select NEED_DMA_MAP_STATE if PPC64 || NOT_COHERENT_CACHE
254254
select NEED_SG_DMA_LENGTH

0 commit comments

Comments
 (0)