Skip to content

Commit bb43a59

Browse files
committed
Rename .data.unlikely to .data..unlikely
Commit 7ccaba5 ("consolidate WARN_...ONCE() static variables") was intended to collect all .data.unlikely sections into one chunk. However, this has not worked when CONFIG_LD_DEAD_CODE_DATA_ELIMINATION or CONFIG_LTO_CLANG is enabled, because .data.unlikely matches the .data.[0-9a-zA-Z_]* pattern in the DATA_MAIN macro. Commit cb87481 ("kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured") was introduced to suppress the issue for the default CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=n case, providing a minimal fix for stable backporting. We were aware this did not address the issue for CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y. The plan was to apply correct fixes and then revert cb87481. [1] Seven years have passed since then, yet the #ifdef workaround remains in place. Using a ".." separator in the section name fixes the issue for CONFIG_LD_DEAD_CODE_DATA_ELIMINATION and CONFIG_LTO_CLANG. [1]: https://lore.kernel.org/linux-kbuild/CAK7LNASck6BfdLnESxXUeECYL26yUDm0cwRZuM4gmaWUkxjL5g@mail.gmail.com/ Fixes: cb87481 ("kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured") Signed-off-by: Masahiro Yamada <[email protected]>
1 parent d63b852 commit bb43a59

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/asm-generic/vmlinux.lds.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG)
357357
*(.data..decrypted) \
358358
*(.ref.data) \
359359
*(.data..shared_aligned) /* percpu related */ \
360-
*(.data.unlikely) \
360+
*(.data..unlikely) \
361361
__start_once = .; \
362362
*(.data.once) \
363363
__end_once = .; \

include/linux/rcupdate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ static inline int debug_lockdep_rcu_enabled(void)
401401
*/
402402
#define RCU_LOCKDEP_WARN(c, s) \
403403
do { \
404-
static bool __section(".data.unlikely") __warned; \
404+
static bool __section(".data..unlikely") __warned; \
405405
if (debug_lockdep_rcu_enabled() && (c) && \
406406
debug_lockdep_rcu_enabled() && !__warned) { \
407407
__warned = true; \

0 commit comments

Comments
 (0)