From 5dad32fe4b0d36bd473afb5636ff06744d449f96 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 7 May 2013 12:58:12 -0500 Subject: [PATCH] BACKPORT: x86: use asmlinkage macro for smm_handler_t The smm_handler_t type was added before the introduction of the asmlinkage macro. Now that asmlinkage is available use it. BUG=None BRANCH=None TEST=Compiled and booted Change-Id: I8a5c98b1ee2df69494ca4c671992e4c635d09a21 Signed-off-by: Aaron Durbin Reviewed-on: https://gerrit.chromium.org/gerrit/50458 Reviewed-by: Stefan Reinauer --- src/include/cpu/x86/smm.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 46b175c625..76dd3a6340 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 #include 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. */