| Message ID | b9b27f2233bd1fa31d72ff937beefdae0e2104e5.camel@perches.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 91970bef48d68d06b2bb3f464b572ad50941f6a9 |
| Headers | show |
| Series | [Possible] arm64: ftrace: Change CONFIG_FTRACE_WITH_REGS to CONFIG_DYNAMIC_FTRACE_WITH_REGS | expand |
On Sat, Jun 06, 2020 at 12:25:50PM -0700, Joe Perches wrote: > CONFIG_FTRACE_WITH_REGS does not exist as a Kconfig symbol. > > Signed-off-by: Joe Perches <joe@perches.com> > --- > > I don't have the hardware, so I can't tell if this is a > correct change, but it is a logical one. > > Found by a test script that looks for IS_ENABLED(FOO) > where FOO must also exist in Kconfig files. > > arch/arm64/kernel/ftrace.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c > index 8618faa82e6d..86a5cf9bc19a 100644 > --- a/arch/arm64/kernel/ftrace.c > +++ b/arch/arm64/kernel/ftrace.c > @@ -69,7 +69,8 @@ static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) > > if (addr == FTRACE_ADDR) > return &plt[FTRACE_PLT_IDX]; > - if (addr == FTRACE_REGS_ADDR && IS_ENABLED(CONFIG_FTRACE_WITH_REGS)) > + if (addr == FTRACE_REGS_ADDR && > + IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS)) > return &plt[FTRACE_REGS_PLT_IDX]; Ha! So much for 100-char lines ;) (fix looks good to me, I'll queue it for -rc1) Will
On Sat, Jun 06, 2020 at 12:25:50PM -0700, Joe Perches wrote: > CONFIG_FTRACE_WITH_REGS does not exist as a Kconfig symbol. > > Signed-off-by: Joe Perches <joe@perches.com> > --- > > I don't have the hardware, so I can't tell if this is a > correct change, but it is a logical one. > > Found by a test script that looks for IS_ENABLED(FOO) > where FOO must also exist in Kconfig files. > > arch/arm64/kernel/ftrace.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c > index 8618faa82e6d..86a5cf9bc19a 100644 > --- a/arch/arm64/kernel/ftrace.c > +++ b/arch/arm64/kernel/ftrace.c > @@ -69,7 +69,8 @@ static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) > > if (addr == FTRACE_ADDR) > return &plt[FTRACE_PLT_IDX]; > - if (addr == FTRACE_REGS_ADDR && IS_ENABLED(CONFIG_FTRACE_WITH_REGS)) > + if (addr == FTRACE_REGS_ADDR && > + IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS)) > return &plt[FTRACE_REGS_PLT_IDX]; This was my bad; I broke this among some cleanup, and evidently I did not test that as well as I thought I had. This should be backported, so we should add: Fixes: 3b23e4991fb66f6d ("arm64: implement ftrace with regs") Looks good to me, so: Acked-by: Mark Rutland <mark.rutland@arm.com> Thanks, Mark.
On Sat, 06 Jun 2020 12:25:50 -0700, Joe Perches wrote:
> CONFIG_FTRACE_WITH_REGS does not exist as a Kconfig symbol.
Applied to arm64 (for-next/core), thanks!
[1/1] arm64: ftrace: Change CONFIG_FTRACE_WITH_REGS to CONFIG_DYNAMIC_FTRACE_WITH_REGS
https://git.kernel.org/arm64/c/91970bef48d6
Cheers,
diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 8618faa82e6d..86a5cf9bc19a 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -69,7 +69,8 @@ static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) if (addr == FTRACE_ADDR) return &plt[FTRACE_PLT_IDX]; - if (addr == FTRACE_REGS_ADDR && IS_ENABLED(CONFIG_FTRACE_WITH_REGS)) + if (addr == FTRACE_REGS_ADDR && + IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS)) return &plt[FTRACE_REGS_PLT_IDX]; #endif return NULL;
CONFIG_FTRACE_WITH_REGS does not exist as a Kconfig symbol. Signed-off-by: Joe Perches <joe@perches.com> --- I don't have the hardware, so I can't tell if this is a correct change, but it is a logical one. Found by a test script that looks for IS_ENABLED(FOO) where FOO must also exist in Kconfig files. arch/arm64/kernel/ftrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)