diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index 62494a9f97..df7e3de5a6 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -33,6 +33,7 @@
 #define SMM_ENTRY_OFFSET 0x8000
 #define SMM_SAVE_STATE_BEGIN(x) (SMM_ENTRY_OFFSET + (x))
 
+#include <arch/cpu.h>
 #include <types.h>
 typedef struct {
 	u16	es_selector;
@@ -429,8 +430,8 @@ struct smm_runtime {
 	u8 apic_id_to_cpu[CONFIG_MAX_CPUS];
 } __attribute__ ((packed));
 
-typedef void __attribute__((cdecl)) (*smm_handler_t)(void *arg, int cpu,
-                              const struct smm_runtime *runtime);
+typedef void asmlinkage (*smm_handler_t)(void *arg, int cpu,
+                                         const struct smm_runtime *runtime);
 
 #ifdef __SMM__
 /* SMM Runtime helpers. */