diff options
Diffstat (limited to 'arch/arm/kernel/jump_label.c')
| -rw-r--r-- | arch/arm/kernel/jump_label.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/arch/arm/kernel/jump_label.c b/arch/arm/kernel/jump_label.c index 4ce4f789446d..a06a92d0f550 100644 --- a/arch/arm/kernel/jump_label.c +++ b/arch/arm/kernel/jump_label.c @@ -1,10 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/kernel.h> #include <linux/jump_label.h> - -#include "insn.h" -#include "patch.h" - -#ifdef HAVE_JUMP_LABEL +#include <asm/text-patching.h> +#include <asm/insn.h> static void __arch_jump_label_transform(struct jump_entry *entry, enum jump_label_type type, @@ -13,13 +11,13 @@ static void __arch_jump_label_transform(struct jump_entry *entry, void *addr = (void *)entry->code; unsigned int insn; - if (type == JUMP_LABEL_ENABLE) + if (type == JUMP_LABEL_JMP) insn = arm_gen_branch(entry->code, entry->target); else insn = arm_gen_nop(); if (is_static) - __patch_text(addr, insn); + __patch_text_early(addr, insn); else patch_text(addr, insn); } @@ -29,11 +27,3 @@ void arch_jump_label_transform(struct jump_entry *entry, { __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); -} - -#endif |