0276ebf166
commit e9666d10a5677a494260d60d1fa0b73cc7646eb3 upstream.
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
[nc: Fix trivial conflicts in 4.19
arch/xtensa/kernel/jump_label.c doesn't exist yet
Ensured CC_HAVE_ASM_GOTO and HAVE_JUMP_LABEL were sufficiently
eliminated]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
36 lines
816 B
C
36 lines
816 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/kernel.h>
|
|
#include <linux/jump_label.h>
|
|
#include <asm/patch.h>
|
|
#include <asm/insn.h>
|
|
|
|
static void __arch_jump_label_transform(struct jump_entry *entry,
|
|
enum jump_label_type type,
|
|
bool is_static)
|
|
{
|
|
void *addr = (void *)entry->code;
|
|
unsigned int insn;
|
|
|
|
if (type == JUMP_LABEL_JMP)
|
|
insn = arm_gen_branch(entry->code, entry->target);
|
|
else
|
|
insn = arm_gen_nop();
|
|
|
|
if (is_static)
|
|
__patch_text_early(addr, insn);
|
|
else
|
|
patch_text(addr, insn);
|
|
}
|
|
|
|
void arch_jump_label_transform(struct jump_entry *entry,
|
|
enum jump_label_type type)
|
|
{
|
|
__arch_jump_label_transform(entry, type, false);
|
|
}
|
|
|
|
void arch_jump_label_transform_static(struct jump_entry *entry,
|
|
enum jump_label_type type)
|
|
{
|
|
__arch_jump_label_transform(entry, type, true);
|
|
}
|