diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-02 03:47:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-02 03:47:16 +0300 |
| commit | d2b2fea3503e5e12b2e28784152937e48bcca6ff (patch) | |
| tree | 05c4ccd2be2c4eb34676d7c0389bc45a2c1ab379 /include/linux | |
| parent | 42cbaeec987b9fb91045060f2e7ce3152458ead9 (diff) | |
| parent | edcc8a38b5ac1a3dbd05e113a38a25b937ebefe5 (diff) | |
| download | linux-d2b2fea3503e5e12b2e28784152937e48bcca6ff.tar.xz | |
Merge tag 'asm-generic-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic updates from Arnd Bergmann:
"Two small patches for the asm-generic header files: Varad Gautam
improves the MMIO tracing to be faster when the tracepoints are built
into the kernel but disabled, while Qi Xi updates the DO_ONCE logic so
that clearing the WARN_ONCE() flags does not change the other DO_ONCE
users"
* tag 'asm-generic-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
once: fix race by moving DO_ONCE to separate section
asm-generic/io.h: Skip trace helpers if rwmmio events are disabled
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/once.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/once.h b/include/linux/once.h index 30346fcdc799..449a0e34ad5a 100644 --- a/include/linux/once.h +++ b/include/linux/once.h @@ -46,7 +46,7 @@ void __do_once_sleepable_done(bool *done, struct static_key_true *once_key, #define DO_ONCE(func, ...) \ ({ \ bool ___ret = false; \ - static bool __section(".data..once") ___done = false; \ + static bool __section(".data..do_once") ___done = false; \ static DEFINE_STATIC_KEY_TRUE(___once_key); \ if (static_branch_unlikely(&___once_key)) { \ unsigned long ___flags; \ @@ -64,7 +64,7 @@ void __do_once_sleepable_done(bool *done, struct static_key_true *once_key, #define DO_ONCE_SLEEPABLE(func, ...) \ ({ \ bool ___ret = false; \ - static bool __section(".data..once") ___done = false; \ + static bool __section(".data..do_once") ___done = false; \ static DEFINE_STATIC_KEY_TRUE(___once_key); \ if (static_branch_unlikely(&___once_key)) { \ ___ret = __do_once_sleepable_start(&___done); \ |