diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-06 15:00:58 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-06 15:00:58 +0300 |
| commit | a500fc918f7b8dc3dff2e6c74f3e73e856c18248 (patch) | |
| tree | 9f580b803731bec6b598ec280f56abc6b13e1a97 /arch | |
| parent | d43f17a1da25373580ebb466de7d0641acbf6fd6 (diff) | |
| parent | bdb1050ee1faaec1e78c15de8b1959176f26c655 (diff) | |
| download | linux-a500fc918f7b8dc3dff2e6c74f3e73e856c18248.tar.xz | |
Merge branch 'locking/core' into x86/mm, to resolve conflict
There's a non-trivial conflict between the parallel TLB flush
framework and the IPI flush debugging code - merge them
manually.
Conflicts:
kernel/smp.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/jump_label.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index 06c3cc22a058..7f2006645d84 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -20,7 +20,7 @@ #include <linux/stringify.h> #include <linux/types.h> -static __always_inline bool arch_static_branch(struct static_key *key, bool branch) +static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch) { asm_volatile_goto("1:" ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" @@ -36,7 +36,7 @@ l_yes: return true; } -static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) +static __always_inline bool arch_static_branch_jump(struct static_key * const key, const bool branch) { asm_volatile_goto("1:" ".byte 0xe9\n\t .long %l[l_yes] - 2f\n\t" |