diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2025-01-15 11:51:56 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-01-15 11:51:56 -0500 |
commit | 5cf32aff2088e650f73f6e291d96cdadd5c02c7a (patch) | |
tree | dba4b4f7e735212aa5ee9fd8e16b754179072390 /kernel/trace/trace_functions.c | |
parent | 10b2c8a67c4b8ec15f9d07d177f63b563418e948 (diff) | |
parent | 2737dee1067c2fc02256b2b15dab158c5e840568 (diff) |
Merge tag 'loongarch-kvm-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD
LoongArch KVM changes for v6.14
1. Clear LLBCTL if secondary mmu mapping changed.
2. Add hypercall service support for usermode VMM.
This is a really small changeset, because the Chinese New Year
(Spring Festival) is coming. Happy New Year!
Diffstat (limited to 'kernel/trace/trace_functions.c')
-rw-r--r-- | kernel/trace/trace_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 74c353164ca1..d358c9935164 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -176,7 +176,8 @@ static void function_trace_start(struct trace_array *tr) tracing_reset_online_cpus(&tr->array_buffer); } -#ifdef CONFIG_FUNCTION_GRAPH_TRACER +/* fregs are guaranteed not to be NULL if HAVE_DYNAMIC_FTRACE_WITH_ARGS is set */ +#if defined(CONFIG_FUNCTION_GRAPH_TRACER) && defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) static __always_inline unsigned long function_get_true_parent_ip(unsigned long parent_ip, struct ftrace_regs *fregs) { |