Message ID | 1420626958-31254-3-git-send-email-anton@samba.org (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
On 01/07/2015 05:35 AM, Anton Blanchard wrote: > Commit 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL") > converted uses of CONFIG_JUMP_LABEL to HAVE_JUMP_LABEL in > some assembly files. > > HAVE_JUMP_LABEL is defined in linux/jump_label.h, so we need to > include this or we always get the non jump label fallback code. > > Fixes: 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL") > Signed-off-by: Anton Blanchard <anton@samba.org> > --- > arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +- > arch/powerpc/platforms/pseries/hvCall.S | 2 +- > arch/powerpc/platforms/pseries/lpar.c | 1 + > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S > index 0509bca..fcbe899 100644 > --- a/arch/powerpc/platforms/powernv/opal-wrappers.S > +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S > @@ -9,11 +9,11 @@ > * 2 of the License, or (at your option) any later version. > */ > > +#include <linux/jump_label.h> > #include <asm/ppc_asm.h> > #include <asm/hvcall.h> > #include <asm/asm-offsets.h> > #include <asm/opal.h> > -#include <asm/jump_label.h> > > .section ".text" > > diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S > index ccd53f9..74b5b8e 100644 > --- a/arch/powerpc/platforms/pseries/hvCall.S > +++ b/arch/powerpc/platforms/pseries/hvCall.S > @@ -7,12 +7,12 @@ > * as published by the Free Software Foundation; either version > * 2 of the License, or (at your option) any later version. > */ > +#include <linux/jump_label.h> > #include <asm/hvcall.h> > #include <asm/processor.h> > #include <asm/ppc_asm.h> > #include <asm/asm-offsets.h> > #include <asm/ptrace.h> > -#include <asm/jump_label.h> > > .section ".text" > > diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c > index 469751d..14ac1ad 100644 > --- a/arch/powerpc/platforms/pseries/lpar.c > +++ b/arch/powerpc/platforms/pseries/lpar.c > @@ -27,6 +27,7 @@ > #include <linux/console.h> > #include <linux/export.h> > #include <linux/static_key.h> > +#include <linux/jump_label.h> > #include <asm/processor.h> > #include <asm/mmu.h> > #include <asm/page.h> You can drop the 'static_key.h' include here since its redundant. Thanks, -Jason
Hi Jason, > > diff --git a/arch/powerpc/platforms/pseries/lpar.c > > b/arch/powerpc/platforms/pseries/lpar.c index 469751d..14ac1ad > > 100644 --- a/arch/powerpc/platforms/pseries/lpar.c > > +++ b/arch/powerpc/platforms/pseries/lpar.c > > @@ -27,6 +27,7 @@ > > #include <linux/console.h> > > #include <linux/export.h> > > #include <linux/static_key.h> > > +#include <linux/jump_label.h> > > #include <asm/processor.h> > > #include <asm/mmu.h> > > #include <asm/page.h> > > You can drop the 'static_key.h' include here since its redundant. Thanks, I incorporated this into the next series. Anton
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S index 0509bca..fcbe899 100644 --- a/arch/powerpc/platforms/powernv/opal-wrappers.S +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S @@ -9,11 +9,11 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/jump_label.h> #include <asm/ppc_asm.h> #include <asm/hvcall.h> #include <asm/asm-offsets.h> #include <asm/opal.h> -#include <asm/jump_label.h> .section ".text" diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S index ccd53f9..74b5b8e 100644 --- a/arch/powerpc/platforms/pseries/hvCall.S +++ b/arch/powerpc/platforms/pseries/hvCall.S @@ -7,12 +7,12 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ +#include <linux/jump_label.h> #include <asm/hvcall.h> #include <asm/processor.h> #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> #include <asm/ptrace.h> -#include <asm/jump_label.h> .section ".text" diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 469751d..14ac1ad 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -27,6 +27,7 @@ #include <linux/console.h> #include <linux/export.h> #include <linux/static_key.h> +#include <linux/jump_label.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/page.h>
Commit 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL") converted uses of CONFIG_JUMP_LABEL to HAVE_JUMP_LABEL in some assembly files. HAVE_JUMP_LABEL is defined in linux/jump_label.h, so we need to include this or we always get the non jump label fallback code. Fixes: 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL") Signed-off-by: Anton Blanchard <anton@samba.org> --- arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +- arch/powerpc/platforms/pseries/hvCall.S | 2 +- arch/powerpc/platforms/pseries/lpar.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)