diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-25 07:18:31 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-25 07:18:31 -1000 |
| commit | 6bacf660776396d43e349817574715bbf229b8ab (patch) | |
| tree | 1d3d1ec57c73cc1be01c4cc0a0ae8d30e0254988 /include/linux | |
| parent | f1869a890cdedb92a3fab969db5d0fd982850273 (diff) | |
| parent | 578ae447e7e5d78c90ac40a06406c1741f79ba96 (diff) | |
| download | linux-6bacf660776396d43e349817574715bbf229b8ab.tar.gz linux-6bacf660776396d43e349817574715bbf229b8ab.tar.bz2 linux-6bacf660776396d43e349817574715bbf229b8ab.zip | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Two fixes: tighten up a jump-labels warning to not trigger on certain
modules and fix confusing (and non-existent) mutex API documentation"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
jump_label: Disable jump labels in __exit code
locking/mutex: Improve documentation
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/jump_label.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index 2168cc6b8b30..b46b541c67c4 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -151,7 +151,7 @@ extern struct jump_entry __start___jump_table[]; extern struct jump_entry __stop___jump_table[]; extern void jump_label_init(void); -extern void jump_label_invalidate_init(void); +extern void jump_label_invalidate_initmem(void); extern void jump_label_lock(void); extern void jump_label_unlock(void); extern void arch_jump_label_transform(struct jump_entry *entry, @@ -199,7 +199,7 @@ static __always_inline void jump_label_init(void) static_key_initialized = true; } -static inline void jump_label_invalidate_init(void) {} +static inline void jump_label_invalidate_initmem(void) {} static __always_inline bool static_key_false(struct static_key *key) { |