From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D341C636CC for ; Mon, 13 Feb 2023 10:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231127AbjBMKTF (ORCPT ); Mon, 13 Feb 2023 05:19:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230506AbjBMKTC (ORCPT ); Mon, 13 Feb 2023 05:19:02 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AD5C312F32 for ; Mon, 13 Feb 2023 02:18:43 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A5CC21E7D; Mon, 13 Feb 2023 02:19:11 -0800 (PST) Received: from godel.lab.cambridge.arm.com (godel.lab.cambridge.arm.com [10.7.66.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 16B673F703; Mon, 13 Feb 2023 02:18:27 -0800 (PST) From: Nikos Nikoleris To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, andrew.jones@linux.dev Cc: pbonzini@redhat.com, alexandru.elisei@arm.com, ricarkol@google.com, Andrew Jones Subject: [PATCH v4 21/30] lib: Avoid ms_abi for calls related to EFI on arm64 Date: Mon, 13 Feb 2023 10:17:50 +0000 Message-Id: <20230213101759.2577077-22-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230213101759.2577077-1-nikos.nikoleris@arm.com> References: <20230213101759.2577077-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org x86_64 requires that EFI calls use the ms_abi calling convention. For arm64 this is unnecessary. Signed-off-by: Nikos Nikoleris Reviewed-by: Andrew Jones --- lib/linux/efi.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/linux/efi.h b/lib/linux/efi.h index 9a1cf87b..53748dd4 100644 --- a/lib/linux/efi.h +++ b/lib/linux/efi.h @@ -33,7 +33,11 @@ typedef u16 efi_char16_t; /* UNICODE character */ typedef u64 efi_physical_addr_t; typedef void *efi_handle_t; +#ifdef __x86_64__ #define __efiapi __attribute__((ms_abi)) +#else +#define __efiapi +#endif /* * The UEFI spec and EDK2 reference implementation both define EFI_GUID as -- 2.25.1