How about this instead -- just get rid of the macros on x86 as well if mixed mode isn't enabled, and condition the generic definition on CONFIG_EFI_MIXED? Arvind Sankar (1): efi/libstub: Fix mixed mode boot issue after macro refactor arch/x86/include/asm/efi.h | 17 +++++++++++++---- drivers/firmware/efi/libstub/efistub.h | 14 ++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) -- 2.26.2