Skip to content

Commit a7d2475

Browse files
mpempe
committed
powerpc: Sort the selects under CONFIG_PPC
We have a big list of selects under CONFIG_PPC, and currently they're completely unsorted. This means people tend to add new selects at the bottom of the list, and so two commits which both add a new select will often conflict. Instead sort it alphabetically. This is nicer in and of itself, but also means two commits that add a new select will have a greater chance of not conflicting. Add a note at the top and bottom asking people to keep it sorted. And while we're here pad out the 'if' expressions to make them stand out. Suggested-by: Stephen Rothwell <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 9c7a008 commit a7d2475

File tree

1 file changed

+72
-66
lines changed

1 file changed

+72
-66
lines changed

‎arch/powerpc/Kconfig

Lines changed: 72 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -80,93 +80,99 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK
8080
config PPC
8181
bool
8282
default y
83-
select BUILDTIME_EXTABLE_SORT
83+
#
84+
# Please keep this list sorted alphabetically.
85+
#
86+
select ARCH_HAS_DEVMEM_IS_ALLOWED
87+
select ARCH_HAS_DMA_SET_COHERENT_MASK
88+
select ARCH_HAS_ELF_RANDOMIZE
89+
select ARCH_HAS_GCOV_PROFILE_ALL
90+
select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
91+
select ARCH_HAS_SG_CHAIN
92+
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
93+
select ARCH_HAS_UBSAN_SANITIZE_ALL
94+
select ARCH_HAVE_NMI_SAFE_CMPXCHG
8495
select ARCH_MIGHT_HAVE_PC_PARPORT
8596
select ARCH_MIGHT_HAVE_PC_SERIO
97+
select ARCH_SUPPORTS_ATOMIC_RMW
98+
select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
99+
select ARCH_USE_BUILTIN_BSWAP
100+
select ARCH_USE_CMPXCHG_LOCKREF if PPC64
101+
select ARCH_WANT_IPC_PARSE_VERSION
86102
select BINFMT_ELF
87-
select ARCH_HAS_ELF_RANDOMIZE
88-
select OF
89-
select OF_EARLY_FLATTREE
90-
select OF_RESERVED_MEM
91-
select HAVE_FTRACE_MCOUNT_RECORD
103+
select BUILDTIME_EXTABLE_SORT
104+
select CLONE_BACKWARDS
105+
select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
106+
select EDAC_ATOMIC_SCRUB
107+
select EDAC_SUPPORT
108+
select GENERIC_ATOMIC64 if PPC32
109+
select GENERIC_CLOCKEVENTS
110+
select GENERIC_CLOCKEVENTS_BROADCAST if SMP
111+
select GENERIC_CMOS_UPDATE
112+
select GENERIC_CPU_AUTOPROBE
113+
select GENERIC_IRQ_SHOW
114+
select GENERIC_IRQ_SHOW_LEVEL
115+
select GENERIC_SMP_IDLE_THREAD
116+
select GENERIC_STRNCPY_FROM_USER
117+
select GENERIC_STRNLEN_USER
118+
select GENERIC_TIME_VSYSCALL_OLD
119+
select HAVE_ARCH_AUDITSYSCALL
120+
select HAVE_ARCH_HARDENED_USERCOPY
121+
select HAVE_ARCH_JUMP_LABEL
122+
select HAVE_ARCH_KGDB
123+
select HAVE_ARCH_SECCOMP_FILTER
124+
select HAVE_ARCH_TRACEHOOK
125+
select HAVE_CBPF_JIT if !PPC64
126+
select HAVE_CONTEXT_TRACKING if PPC64
127+
select HAVE_DEBUG_KMEMLEAK
128+
select HAVE_DEBUG_STACKOVERFLOW
129+
select HAVE_DMA_API_DEBUG
92130
select HAVE_DYNAMIC_FTRACE
93-
select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
94-
select HAVE_FUNCTION_TRACER
131+
select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
132+
select HAVE_EBPF_JIT if PPC64
133+
select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
134+
select HAVE_FTRACE_MCOUNT_RECORD
95135
select HAVE_FUNCTION_GRAPH_TRACER
136+
select HAVE_FUNCTION_TRACER
96137
select HAVE_GCC_PLUGINS
97-
select SYSCTL_EXCEPTION_TRACE
98-
select VIRT_TO_BUS if !PPC64
138+
select HAVE_GENERIC_RCU_GUP
139+
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
99140
select HAVE_IDE
100141
select HAVE_IOREMAP_PROT
101-
select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
142+
select HAVE_IRQ_EXIT_ON_IRQ_STACK
143+
select HAVE_KERNEL_GZIP
102144
select HAVE_KPROBES
103-
select HAVE_OPTPROBES if PPC64
104-
select HAVE_ARCH_KGDB
105145
select HAVE_KRETPROBES
106-
select HAVE_ARCH_TRACEHOOK
146+
select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
107147
select HAVE_MEMBLOCK
108148
select HAVE_MEMBLOCK_NODE_MAP
109-
select HAVE_DMA_API_DEBUG
149+
select HAVE_MOD_ARCH_SPECIFIC
150+
select HAVE_NMI if PERF_EVENTS
110151
select HAVE_OPROFILE
111-
select HAVE_DEBUG_KMEMLEAK
112-
select ARCH_HAS_SG_CHAIN
113-
select GENERIC_ATOMIC64 if PPC32
152+
select HAVE_OPTPROBES if PPC64
114153
select HAVE_PERF_EVENTS
154+
select HAVE_PERF_EVENTS_NMI if PPC64
115155
select HAVE_PERF_REGS
116156
select HAVE_PERF_USER_STACK_DUMP
157+
select HAVE_RCU_TABLE_FREE if SMP
117158
select HAVE_REGS_AND_STACK_ACCESS_API
118-
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
119-
select ARCH_WANT_IPC_PARSE_VERSION
120-
select SPARSE_IRQ
159+
select HAVE_SYSCALL_TRACEPOINTS
160+
select HAVE_VIRT_CPU_ACCOUNTING
121161
select IRQ_DOMAIN
122-
select GENERIC_IRQ_SHOW
123-
select GENERIC_IRQ_SHOW_LEVEL
124162
select IRQ_FORCED_THREADING
125-
select HAVE_RCU_TABLE_FREE if SMP
126-
select HAVE_SYSCALL_TRACEPOINTS
127-
select HAVE_CBPF_JIT if !PPC64
128-
select HAVE_EBPF_JIT if PPC64
129-
select HAVE_ARCH_JUMP_LABEL
130-
select ARCH_HAVE_NMI_SAFE_CMPXCHG
131-
select ARCH_HAS_GCOV_PROFILE_ALL
132-
select GENERIC_SMP_IDLE_THREAD
133-
select GENERIC_CMOS_UPDATE
134-
select GENERIC_TIME_VSYSCALL_OLD
135-
select GENERIC_CLOCKEVENTS
136-
select GENERIC_CLOCKEVENTS_BROADCAST if SMP
137-
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
138-
select GENERIC_STRNCPY_FROM_USER
139-
select GENERIC_STRNLEN_USER
140-
select HAVE_MOD_ARCH_SPECIFIC
141163
select MODULES_USE_ELF_RELA
142-
select CLONE_BACKWARDS
143-
select ARCH_USE_BUILTIN_BSWAP
144-
select OLD_SIGSUSPEND
145-
select OLD_SIGACTION if PPC32
146-
select HAVE_DEBUG_STACKOVERFLOW
147-
select HAVE_IRQ_EXIT_ON_IRQ_STACK
148-
select ARCH_USE_CMPXCHG_LOCKREF if PPC64
149-
select HAVE_ARCH_AUDITSYSCALL
150-
select ARCH_SUPPORTS_ATOMIC_RMW
151-
select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
152164
select NO_BOOTMEM
153-
select HAVE_GENERIC_RCU_GUP
154-
select HAVE_PERF_EVENTS_NMI if PPC64
155-
select HAVE_NMI if PERF_EVENTS
156-
select EDAC_SUPPORT
157-
select EDAC_ATOMIC_SCRUB
158-
select ARCH_HAS_DMA_SET_COHERENT_MASK
159-
select ARCH_HAS_DEVMEM_IS_ALLOWED
160-
select HAVE_ARCH_SECCOMP_FILTER
161-
select ARCH_HAS_UBSAN_SANITIZE_ALL
162-
select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
163-
select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
164-
select GENERIC_CPU_AUTOPROBE
165-
select HAVE_VIRT_CPU_ACCOUNTING
166-
select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
167-
select HAVE_ARCH_HARDENED_USERCOPY
168-
select HAVE_KERNEL_GZIP
169-
select HAVE_CONTEXT_TRACKING if PPC64
165+
select OF
166+
select OF_EARLY_FLATTREE
167+
select OF_RESERVED_MEM
168+
select OLD_SIGACTION if PPC32
169+
select OLD_SIGSUSPEND
170+
select SPARSE_IRQ
171+
select SYSCTL_EXCEPTION_TRACE
172+
select VIRT_TO_BUS if !PPC64
173+
#
174+
# Please keep this list sorted alphabetically.
175+
#
170176

171177
config GENERIC_CSUM
172178
def_bool n

0 commit comments

Comments
 (0)