diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
| commit | 6d5e2bf9d203e4d9e08ca2e9420c6ff22ad190af (patch) | |
| tree | c2c20648773d3326f942e34ef73b06566f7a19ec /arch/mips/include/asm/jump_label.h | |
| parent | b820d52e7eed7b30b2dfef5f4213a2bc3cbea6f3 (diff) | |
| parent | 257f9053c0204ea47491aa236004fd1226f75fa8 (diff) | |
Merge branch 'acpi-utils' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-5.2
Diffstat (limited to 'arch/mips/include/asm/jump_label.h')
| -rw-r--r-- | arch/mips/include/asm/jump_label.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h index e77672539e8e..e4456e450f94 100644 --- a/arch/mips/include/asm/jump_label.h +++ b/arch/mips/include/asm/jump_label.h @@ -21,15 +21,15 @@ #endif #ifdef CONFIG_CPU_MICROMIPS -#define NOP_INSN "nop32" +#define B_INSN "b32" #else -#define NOP_INSN "nop" +#define B_INSN "b" #endif static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { - asm_volatile_goto("1:\t" NOP_INSN "\n\t" - "nop\n\t" + asm_volatile_goto("1:\t" B_INSN " 2f\n\t" + "2:\tnop\n\t" ".pushsection __jump_table, \"aw\"\n\t" WORD_INSN " 1b, %l[l_yes], %0\n\t" ".popsection\n\t" |