Unverified Commit ab7fa6b0 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: move options to keep entries sorted 



Recently, some commits break the entries order. Properly move their
locations to keep entries sorted.

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Acked-by: default avatarGuo Ren <guoren@kernel.org>
Tested-by: Nick Desaulniers <ndesaulniers@google.com> # build
Link: https://lore.kernel.org/r/20230523165502.2592-2-jszhang@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 3b90b09a

arch/riscv/Kconfig

+6 −6
Original line number Original line Diff line number Diff line
@@ -101,6 +101,11 @@ config RISCV 
	select HAVE_CONTEXT_TRACKING_USER

	select HAVE_CONTEXT_TRACKING_USER

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS if MMU

	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_EBPF_JIT if MMU

	select HAVE_FUNCTION_ARG_ACCESS_API

	select HAVE_FUNCTION_ARG_ACCESS_API

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_ERROR_INJECTION
@@ -110,7 +115,6 @@ config RISCV 
	select HAVE_KPROBES if !XIP_KERNEL

	select HAVE_KPROBES if !XIP_KERNEL

	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL

	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL

	select HAVE_KRETPROBES if !XIP_KERNEL

	select HAVE_KRETPROBES if !XIP_KERNEL

	select HAVE_RETHOOK if !XIP_KERNEL

	select HAVE_MOVE_PMD

	select HAVE_MOVE_PMD

	select HAVE_MOVE_PUD

	select HAVE_MOVE_PUD

	select HAVE_PCI

	select HAVE_PCI
@@ -119,6 +123,7 @@ config RISCV 
	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_POSIX_CPU_TIMERS_TASK_WORK

	select HAVE_POSIX_CPU_TIMERS_TASK_WORK

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RETHOOK if !XIP_KERNEL

	select HAVE_RSEQ

	select HAVE_RSEQ

	select HAVE_STACKPROTECTOR

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_SYSCALL_TRACEPOINTS
@@ -142,11 +147,6 @@ config RISCV 
	select TRACE_IRQFLAGS_SUPPORT

	select TRACE_IRQFLAGS_SUPPORT

	select UACCESS_MEMCPY if !MMU

	select UACCESS_MEMCPY if !MMU

	select ZONE_DMA32 if 64BIT

	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

config CLANG_SUPPORTS_DYNAMIC_FTRACE

	def_bool CC_IS_CLANG

	def_bool CC_IS_CLANG