[PATCH v2 1/4] riscv: move options to keep entries sorted

[Guo Ren]

On Wed, May 24, 2023 at 1:10 AM Jisheng Zhang <jszhang at kernel.org> wrote:
>
> Recently, some commits break the entries order. Properly move their
> locations to keep entries sorted.
Acked-by: Guo Ren <guoren at kernel.org>

>
> Signed-off-by: Jisheng Zhang <jszhang at kernel.org>
> ---
>  arch/riscv/Kconfig | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 348c0fa1fc8c..8f55aa4aae34 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -101,6 +101,11 @@ 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_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
> +       select HAVE_FUNCTION_GRAPH_TRACER
> +       select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION
>         select HAVE_EBPF_JIT if MMU
>         select HAVE_FUNCTION_ARG_ACCESS_API
>         select HAVE_FUNCTION_ERROR_INJECTION
> @@ -110,7 +115,6 @@ config RISCV
>         select HAVE_KPROBES if !XIP_KERNEL
>         select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL
>         select HAVE_KRETPROBES if !XIP_KERNEL
> -       select HAVE_RETHOOK if !XIP_KERNEL
>         select HAVE_MOVE_PMD
>         select HAVE_MOVE_PUD
>         select HAVE_PCI
> @@ -119,6 +123,7 @@ config RISCV
>         select HAVE_PERF_USER_STACK_DUMP
>         select HAVE_POSIX_CPU_TIMERS_TASK_WORK
>         select HAVE_REGS_AND_STACK_ACCESS_API
> +       select HAVE_RETHOOK if !XIP_KERNEL
>         select HAVE_RSEQ
>         select HAVE_STACKPROTECTOR
>         select HAVE_SYSCALL_TRACEPOINTS
> @@ -142,11 +147,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_TRACER if !XIP_KERNEL && !PREEMPTION
>
>  config CLANG_SUPPORTS_DYNAMIC_FTRACE
>         def_bool CC_IS_CLANG
> --
> 2.40.1
>


-- 
Best Regards
 Guo Ren