[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <174178075738.14745.15433710467224904900.tip-bot2@tip-bot2>
Date: Wed, 12 Mar 2025 11:59:17 -0000
From: "tip-bot2 for Ingo Molnar" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Ingo Molnar <mingo@...nel.org>, Brian Gerst <brgerst@...il.com>,
Ard Biesheuvel <ardb@...nel.org>, Uros Bizjak <ubizjak@...il.com>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/asm] x86/stackprotector/64: Only export
__ref_stack_chk_guard on CONFIG_SMP
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@...nel.org>
AuthorDate: Wed, 12 Mar 2025 12:48:49 +01:00
Committer: Ingo Molnar <mingo@...nel.org>
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@...nel.org>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Ard Biesheuvel <ardb@...nel.org>
Cc: Uros Bizjak <ubizjak@...il.com>
Link: https://lore.kernel.org/r/20250123190747.745588-8-brgerst@gmail.com
---
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
Powered by blists - more mailing lists