diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 16:42:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 16:42:37 -0700 |
| commit | 151647ab581013b482893d4e2218cd29b005cd6b (patch) | |
| tree | 79ce01c0e430047f0adde58f065ad696f6121af3 /include | |
| parent | 923a327e8f2257ab7cd5485cb5d8db92c965dfca (diff) | |
| parent | e81859fe64ad42dccefe134d1696e0635f78d763 (diff) | |
Merge tag 'locking-core-2024-07-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking updates from Ingo Molnar:
- Jump label fixes, including a perf events fix that originally
manifested as jump label failures, but was a serialization bug at the
usage site
- Mark down_write*() helpers as __always_inline, to improve WCHAN
debuggability
- Misc cleanups and fixes
* tag 'locking-core-2024-07-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
jump_label: Simplify and clarify static_key_fast_inc_cpus_locked()
jump_label: Clarify condition in static_key_fast_inc_not_disabled()
jump_label: Fix concurrency issues in static_key_slow_dec()
perf/x86: Serialize set_attr_rdpmc()
cleanup: Standardize the header guard define's name
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cleanup.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h index 80c4181e194a..d9e613803df1 100644 --- a/include/linux/cleanup.h +++ b/include/linux/cleanup.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __LINUX_GUARDS_H -#define __LINUX_GUARDS_H +#ifndef _LINUX_CLEANUP_H +#define _LINUX_CLEANUP_H #include <linux/compiler.h> @@ -250,4 +250,4 @@ __DEFINE_LOCK_GUARD_0(_name, _lock) { return class_##_name##_lock_ptr(_T); } -#endif /* __LINUX_GUARDS_H */ +#endif /* _LINUX_CLEANUP_H */ |