Messages in this thread | | | Date | Tue, 4 Jul 2023 09:59:53 -0400 | From | Steven Rostedt <> | Subject | Re: [PATCH] arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n |
| |
On Fri, 30 Jun 2023 17:02:39 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote: > > diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c > > index 757d01a68ffd0..5ff1942b04fcf 100644 > > --- a/arch/arm64/kernel/asm-offsets.c > > +++ b/arch/arm64/kernel/asm-offsets.c > > @@ -213,9 +213,9 @@ int main(void) > > DEFINE(FGRET_REGS_X7, offsetof(struct fgraph_ret_regs, regs[7])); > > DEFINE(FGRET_REGS_FP, offsetof(struct fgraph_ret_regs, fp)); > > DEFINE(FGRET_REGS_SIZE, sizeof(struct fgraph_ret_regs)); > > +#endif > > #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS > > DEFINE(FTRACE_OPS_DIRECT_CALL, offsetof(struct ftrace_ops, direct_call)); > > -#endif > > #endif > > return 0; > > } > > Acked-by: Catalin Marinas <catalin.marinas@arm.com> > > Steven, since the fixed commit went in via your tree, could you please > pick this up as well for -rc1? Otherwise I'll queue it for -rc2 once the > ftrace changes turn up in -rc1.
I'm working on a fixes pull request for Linus. I'll apply this to it and start my testing on it. I should have a pull request to Linus before the end of the week.
-- Steve
| |