3.16.68-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Anton Blanchard <an...@samba.org> commit c0ccf6f99e3a43b87980c9df7da48427885206d0 upstream. To use jump labels in assembly we need the HAVE_JUMP_LABEL define, so we select a fallback version if the toolchain does not support them. Modify linux/jump_label.h so it can be included by assembly files. We also need to add -DCC_HAVE_ASM_GOTO to KBUILD_AFLAGS. Signed-off-by: Anton Blanchard <an...@samba.org> Acked-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: b...@kernel.crashing.org Cc: catalin.mari...@arm.com Cc: da...@davemloft.net Cc: heiko.carst...@de.ibm.com Cc: jba...@akamai.com Cc: li...@arm.linux.org.uk Cc: linuxppc-dev@lists.ozlabs.org Cc: liu...@gmail.com Cc: mgor...@suse.de Cc: mma...@suse.cz Cc: m...@ellerman.id.au Cc: pau...@samba.org Cc: r...@linux-mips.org Cc: rost...@goodmis.org Cc: schwidef...@de.ibm.com Cc: will.dea...@arm.com Link: http://lkml.kernel.org/r/1428551492-21977-2-git-send-email-an...@samba.org Signed-off-by: Ingo Molnar <mi...@kernel.org> Signed-off-by: Ben Hutchings <b...@decadent.org.uk> --- Makefile | 1 + include/linux/jump_label.h | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) --- a/Makefile +++ b/Makefile @@ -761,6 +761,7 @@ KBUILD_ARFLAGS := $(call ar-option,D) # check for 'asm goto' ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO endif include $(srctree)/scripts/Makefile.extrawarn --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -45,6 +45,12 @@ * same as using STATIC_KEY_INIT_FALSE. */ +#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) +# define HAVE_JUMP_LABEL +#endif + +#ifndef __ASSEMBLY__ + #include <linux/types.h> #include <linux/compiler.h> #include <linux/bug.h> @@ -55,7 +61,7 @@ extern bool static_key_initialized; "%s used before call to jump_label_init", \ __func__) -#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) +#ifdef HAVE_JUMP_LABEL struct static_key { atomic_t enabled; @@ -66,13 +72,18 @@ struct static_key { #endif }; -# include <asm/jump_label.h> -# define HAVE_JUMP_LABEL #else struct static_key { atomic_t enabled; }; -#endif /* CC_HAVE_ASM_GOTO && CONFIG_JUMP_LABEL */ +#endif /* HAVE_JUMP_LABEL */ +#endif /* __ASSEMBLY__ */ + +#ifdef HAVE_JUMP_LABEL +#include <asm/jump_label.h> +#endif + +#ifndef __ASSEMBLY__ enum jump_label_type { JUMP_LABEL_DISABLE = 0, @@ -223,3 +234,5 @@ static inline void static_key_disable(st } #endif /* _LINUX_JUMP_LABEL_H */ + +#endif /* __ASSEMBLY__ */
