[PATCH 2/4] riscv: move HAVE_RETHOOK to keep entries sorted

Conor Dooley conor.dooley at microchip.com
Fri May 12 06:54:03 PDT 2023


On Thu, May 11, 2023 at 10:12:09PM +0800, Jisheng Zhang wrote:
> Commit b57c2f124098 ("riscv: add riscv rethook implementation") selects
> the HAVE_RETHOOK option for the first time in riscv, but it breaks the
> entries order. Properly move its location to keep entries sorted.

The entries need a rework in general, but it's only really worth doing
the whole lot during the merge window to avoid a rake of conflicts.

Reviewed-by: Conor Dooley <conor.dooley at microchip.com>

Thanks,
Conor.

> 
> Signed-off-by: Jisheng Zhang <jszhang at kernel.org>
> ---
>  arch/riscv/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 348c0fa1fc8c..f0663b52d052 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -110,7 +110,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 +118,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
> -- 
> 2.40.1
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-riscv/attachments/20230512/a03ed090/attachment.sig>


More information about the linux-riscv mailing list