| Message ID | 201808162136.27788.luke@dashjr.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | powerpc64/ftrace: Include ftrace.h needed for enable/disable calls | expand |
Luke Dashjr wrote: > this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.h > Without it included, the build fails. I'm unable to reproduce this. Can you share your .config and the build environment? > > Fixes: a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm entry/exit") > Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org> > Cc: stable@vger.kernel.org > --- > arch/powerpc/kvm/book3s_hv.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index ee4a8854985e..15c2c64291f4 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -46,6 +46,7 @@ > #include <linux/compiler.h> > #include <linux/of.h> > > +#include <asm/ftrace.h> > #include <asm/reg.h> > #include <asm/ppc-opcode.h> > #include <asm/asm-prototypes.h> In any case, this change itself looks alright to me. So: Acked-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Thanks, Naveen
On Friday 17 August 2018 10:25:40 Naveen N. Rao wrote: > Luke Dashjr wrote: > > this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in > > ftrace.h Without it included, the build fails. > > I'm unable to reproduce this. Can you share your .config and the build > environment? https://luke.dashjr.org/tmp/code/4.18-config.xz Gentoo GNU/Linux (mostly stable keywords) on a Raptor Talos II POWER9 system. > > Fixes: a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm > > entry/exit") Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org> > > Cc: stable@vger.kernel.org > > --- > > arch/powerpc/kvm/book3s_hv.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > > index ee4a8854985e..15c2c64291f4 100644 > > --- a/arch/powerpc/kvm/book3s_hv.c > > +++ b/arch/powerpc/kvm/book3s_hv.c > > @@ -46,6 +46,7 @@ > > #include <linux/compiler.h> > > #include <linux/of.h> > > > > +#include <asm/ftrace.h> > > #include <asm/reg.h> > > #include <asm/ppc-opcode.h> > > #include <asm/asm-prototypes.h> > > In any case, this change itself looks alright to me. So: > Acked-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > > > Thanks, > Naveen
Luke Dashjr wrote: > On Friday 17 August 2018 10:25:40 Naveen N. Rao wrote: >> Luke Dashjr wrote: >> > this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in >> > ftrace.h Without it included, the build fails. >> >> I'm unable to reproduce this. Can you share your .config and the build >> environment? > > https://luke.dashjr.org/tmp/code/4.18-config.xz > > Gentoo GNU/Linux (mostly stable keywords) on a Raptor Talos II POWER9 system. Thanks. Your config is missing CONFIG_TRACEPOINTS and I hadn't tested that. The below fix looks good and I've confirmed that the other uses are fine as well. - Naveen
Luke Dashjr <luke@dashjr.org> writes: > this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.h > Without it included, the build fails. > > Fixes: a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm entry/exit") > Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org> > Cc: stable@vger.kernel.org > --- > arch/powerpc/kvm/book3s_hv.c | 1 + > 1 file changed, 1 insertion(+) I've picked this up. If you can Cc linuxppc-dev on arch/powerpc patches that would be ideal, that way my patchwork[1] picks it up. I realise this is a KVM patch so you've Cc'ed kvm-ppc but it's also a powerpc patch :) If you use scripts/get_maintainer.pl it should give you the right answer. cheers [1]: https://patchwork.ozlabs.org/project/linuxppc-dev > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index ee4a8854985e..15c2c64291f4 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -46,6 +46,7 @@ > #include <linux/compiler.h> > #include <linux/of.h> > > +#include <asm/ftrace.h> > #include <asm/reg.h> > #include <asm/ppc-opcode.h> > #include <asm/asm-prototypes.h> > -- > 2.16.4
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index ee4a8854985e..15c2c64291f4 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -46,6 +46,7 @@ #include <linux/compiler.h> #include <linux/of.h> +#include <asm/ftrace.h> #include <asm/reg.h> #include <asm/ppc-opcode.h> #include <asm/asm-prototypes.h>
this_cpu_disable_ftrace and this_cpu_enable_ftrace are inlines in ftrace.h Without it included, the build fails. Fixes: a4bc64d305af ("powerpc64/ftrace: Disable ftrace during kvm entry/exit") Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org> Cc: stable@vger.kernel.org --- arch/powerpc/kvm/book3s_hv.c | 1 + 1 file changed, 1 insertion(+)