diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-11 07:39:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-11 07:39:37 +0200 |
| commit | ec0ad3d01f99d5e5b56a99a58f7003b99250dc65 (patch) | |
| tree | 85066cbea1cf8da6d099019adefaca90aae39234 /arch/s390/include/asm | |
| parent | sched/numa: Reflow task_numa_group() to avoid a compiler warning (diff) | |
| parent | compiler/gcc4: Add quirk for 'asm goto' miscompilation bug (diff) | |
| download | linux-ec0ad3d01f99d5e5b56a99a58f7003b99250dc65.tar.xz linux-ec0ad3d01f99d5e5b56a99a58f7003b99250dc65.zip | |
Merge branch 'core/urgent' into sched/core
Merge in asm goto fix, to be able to apply the asm/rmwcc.h fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/jump_label.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h index 6c32190dc73e..346b1c85ffb4 100644 --- a/arch/s390/include/asm/jump_label.h +++ b/arch/s390/include/asm/jump_label.h @@ -15,7 +15,7 @@ static __always_inline bool arch_static_branch(struct static_key *key) { - asm goto("0: brcl 0,0\n" + asm_volatile_goto("0: brcl 0,0\n" ".pushsection __jump_table, \"aw\"\n" ASM_ALIGN "\n" ASM_PTR " 0b, %l[label], %0\n" |