leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'core/urgent' into sched/core

Browse Source 
Merge in asm goto fix, to be able to apply the asm/rmwcc.h fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2013-10-11 07:39:37 +02:00
parent 3354781a21 3f0116c323
commit ec0ad3d01f
72 changed files with 457 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/jump_label.h
View File

@@ -16,7 +16,7 @@
static __always_inline bool arch_static_branch(struct static_key *key)
{
asm goto("1:\n\t"
asm_volatile_goto("1:\n\t"
JUMP_LABEL_NOP "\n\t"
".pushsection __jump_table, \"aw\"\n\t"
".word 1b, %l[l_yes], %c0\n\t"