[PATCH] RISC-V: Re-alphabetize Kconfig

[Palmer Dabbelt]

On Fri, 07 Jul 2023 02:55:21 PDT (-0700), Conor Dooley wrote:
> On Thu, Jul 06, 2023 at 02:04:57PM -0700, Palmer Dabbelt wrote:
>> Looks like I missed a few of these, I just stumbled on these again due
>> to a merge conflict.
>>
>> Fixes: f32b4b467ebd ("RISC-V: enable dynamic ftrace for RV32I")
>> Signed-off-by: Palmer Dabbelt <palmer at rivosinc.com>
>> ---
>>  arch/riscv/Kconfig | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
>> index b49793cf34eb..6553cc6c0858 100644
>> --- a/arch/riscv/Kconfig
>> +++ b/arch/riscv/Kconfig
>> @@ -105,9 +105,15 @@ config RISCV
>>  	select HAVE_CONTEXT_TRACKING_USER
>>  	select HAVE_DEBUG_KMEMLEAK
>>  	select HAVE_DMA_CONTIGUOUS if MMU
>> +	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && (CLANG_SUPPORTS_DYNAMIC_FTRACE || GCC_SUPPORTS_DYNAMIC_FTRACE)
>> +	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
>>  	select HAVE_EBPF_JIT if MMU
>> +	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
>>  	select HAVE_FUNCTION_ARG_ACCESS_API
>>  	select HAVE_FUNCTION_ERROR_INJECTION
>> +	select HAVE_FUNCTION_GRAPH_TRACER
>> +	select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
>> +	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION
>>  	select HAVE_GCC_PLUGINS
>>  	select HAVE_GENERIC_VDSO if MMU && 64BIT
>>  	select HAVE_IRQ_TIME_ACCOUNTING
>> @@ -148,12 +154,6 @@ config RISCV
>>  	select TRACE_IRQFLAGS_SUPPORT
>>  	select UACCESS_MEMCPY if !MMU
>>  	select ZONE_DMA32 if 64BIT
>> -	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && (CLANG_SUPPORTS_DYNAMIC_FTRACE || GCC_SUPPORTS_DYNAMIC_FTRACE)
>> -	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
>> -	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
>> -	select HAVE_FUNCTION_GRAPH_TRACER
>> -	select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
>> -	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION
>>
>>  config CLANG_SUPPORTS_DYNAMIC_FTRACE
>>  	def_bool CC_IS_CLANG
>
> There's a bunch more elsewhere in our Kconfig stuff, but no point
> hanging around on re-sorting this stuff..

Ya, it's become a mess again.  At some point I had a script to poke 
these when merging patches, but I lost most of that stuff when I moved 
to b4.

> Reviewed-by: Conor Dooley <conor.dooley at microchip.com>
>
> Cheers,
> Conor.
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv