Commit e9666d10 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

jump_label: move 'asm goto' support test to Kconfig 



Currently, CONFIG_JUMP_LABEL just means "I _want_ to use jump label".

The jump label is controlled by HAVE_JUMP_LABEL, which is defined
like this:

  #if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL)
  # define HAVE_JUMP_LABEL
  #endif

We can improve this by testing 'asm goto' support in Kconfig, then
make JUMP_LABEL depend on CC_HAS_ASM_GOTO.

Ugly #ifdef HAVE_JUMP_LABEL will go away, and CONFIG_JUMP_LABEL will
match to the real kernel capability.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Tested-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
parent 72d3ebb9

Makefile

+0 −7
Original line number Diff line number Diff line
@@ -514,13 +514,6 @@ RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc 
export RETPOLINE_CFLAGS

export RETPOLINE_VDSO_CFLAGS



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

  CC_HAVE_ASM_GOTO := 1

  KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

  KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif



# The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.

# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.

# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),

arch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ config KPROBES 
config JUMP_LABEL

       bool "Optimize very unlikely/likely branches"

       depends on HAVE_ARCH_JUMP_LABEL

       depends on CC_HAS_ASM_GOTO

       help

         This option enables a transparent branch optimization that

	 makes certain almost-always-true or almost-always-false branch

arch/arm/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
#include <asm/patch.h>

#include <asm/insn.h>



#ifdef HAVE_JUMP_LABEL



static void __arch_jump_label_transform(struct jump_entry *entry,

					enum jump_label_type type,

					bool is_static)
@@ -35,5 +33,3 @@ void arch_jump_label_transform_static(struct jump_entry *entry, 
{

	__arch_jump_label_transform(entry, type, true);

}
 


#endif

arch/arm64/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <linux/jump_label.h>

#include <asm/insn.h>



#ifdef HAVE_JUMP_LABEL



void arch_jump_label_transform(struct jump_entry *entry,

			       enum jump_label_type type)

{
@@ -49,5 +47,3 @@ void arch_jump_label_transform_static(struct jump_entry *entry, 
	 * NOP needs to be replaced by a branch.

	 */

}
 


#endif	/* HAVE_JUMP_LABEL */

arch/mips/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <asm/cacheflush.h>

#include <asm/inst.h>



#ifdef HAVE_JUMP_LABEL



/*

 * Define parameters for the standard MIPS and the microMIPS jump

 * instruction encoding respectively:
@@ -70,5 +68,3 @@ void arch_jump_label_transform(struct jump_entry *e, 


	mutex_unlock(&text_mutex);

}
 


#endif /* HAVE_JUMP_LABEL */

CRA Git | Maintained and supported by SUSTech CRA and CCSE