The following commit has been merged into the x86/asm branch of tip: Commit-ID: c0560fbaab0dab0afbdb3e339b3cb61ef8d3115e Gitweb: https://git.kernel.org/tip/c0560fbaab0dab0afbdb3e339b3cb61ef8d3115e Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Wed, 12 Mar 2025 12:48:49 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Wed, 12 Mar 2025 12:51:35 +01:00 x86/stackprotector/64: Only export __ref_stack_chk_guard on CONFIG_SMP The __ref_stack_chk_guard symbol doesn't exist on UP: <stdin>:4:15: error: ‘__ref_stack_chk_guard’ undeclared here (not in a function) Fix the #ifdef around the entry.S export. Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Brian Gerst <brgerst@xxxxxxxxx> Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> Cc: Uros Bizjak <ubizjak@xxxxxxxxx> Link: https://lore.kernel.org/r/20250123190747.745588-8-brgerst@xxxxxxxxx --- arch/x86/entry/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/entry.S b/arch/x86/entry/entry.S index fe5344a..35a91cf 100644 --- a/arch/x86/entry/entry.S +++ b/arch/x86/entry/entry.S @@ -62,6 +62,6 @@ THUNK warn_thunk_thunk, __warn_thunk * entirely in the C code, and use an alias emitted by the linker script * instead. */ -#ifdef CONFIG_STACKPROTECTOR +#if defined(CONFIG_STACKPROTECTOR) && defined(CONFIG_SMP) EXPORT_SYMBOL(__ref_stack_chk_guard); #endif
|