2 files changed, 9 insertions, 3 deletions
diff --git a/src/cpu/amd/smm/smm_init.c b/src/cpu/amd/smm/smm_init.c
index 4d04cf7762..7af8808c62 100644
--- a/src/cpu/amd/smm/smm_init.c
+++ b/src/cpu/amd/smm/smm_init.c
@@ -77,3 +77,7 @@ void smm_lock(void)
 {
 	/* We lock SMM in CPU init */
 }
+
+void smm_init_completion(void)
+{
+}
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index c2ac51374d..898a5c476a 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -593,11 +593,13 @@ void initialize_cpus(struct bus *cpu_bus)
 		recover_lowest_1M();
 }
 
-/* Platform-specific code for SMI handler overrides this. */
-__attribute__((weak)) void smm_init(void)
+#if !IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)
+/* Empty stubs for platforms without SMI handlers. */
+void smm_init(void)
 {
 }
 
-__attribute__((weak)) void smm_init_completion(void)
+void smm_init_completion(void)
 {
 }
+#endif