diff options
| author | Tejun Heo <tj@kernel.org> | 2014-11-22 09:32:08 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-11-22 09:32:08 -0500 |
| commit | cceb9bd63373061ad7b75c321808a2fb11c86545 (patch) | |
| tree | a70d939eabed2e19538707402441644dfc26990e /arch/mips/include/asm/jump_label.h | |
| parent | 56e4dea81a55c338eede625f715c7fa21f1a28c4 (diff) | |
| parent | 8a84e01e147f44111988f9d8ccd2eaa30215a0f2 (diff) | |
| download | op-kernel-dev-cceb9bd63373061ad7b75c321808a2fb11c86545.zip op-kernel-dev-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.gz | |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/jump_label.h')
| -rw-r--r-- | arch/mips/include/asm/jump_label.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h index e194f95..fdbff44 100644 --- a/arch/mips/include/asm/jump_label.h +++ b/arch/mips/include/asm/jump_label.h @@ -20,9 +20,15 @@ #define WORD_INSN ".word" #endif +#ifdef CONFIG_CPU_MICROMIPS +#define NOP_INSN "nop32" +#else +#define NOP_INSN "nop" +#endif + static __always_inline bool arch_static_branch(struct static_key *key) { - asm_volatile_goto("1:\tnop\n\t" + asm_volatile_goto("1:\t" NOP_INSN "\n\t" "nop\n\t" ".pushsection __jump_table, \"aw\"\n\t" WORD_INSN " 1b, %l[l_yes], %0\n\t" |
