From: Daniel Kiper <daniel.kiper@oracle.com>
Date: Fri, 30 Jun 2023 14:02:14 +0000 (+0200)
Subject: efi: Drop __grub_efi_api attribute from shim_lock->verify() function
X-Git-Tag: grub-2.12-rc1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7082a5ca8abd79c1e8840c59759f53c4c80e286d;p=thirdparty%2Fgrub.git

efi: Drop __grub_efi_api attribute from shim_lock->verify() function

... because (surprisingly) it does not use specific EFI calling convention...

Fixes: 6a080b9cd (efi: Add calling convention annotation to all prototypes)

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
---

diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 16161e1f0..d3eaef3fb 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -1777,7 +1777,11 @@ typedef struct grub_efi_block_io grub_efi_block_io_t;
 
 struct grub_efi_shim_lock_protocol
 {
-  grub_efi_status_t (__grub_efi_api *verify) (void *buffer, grub_uint32_t size);
+  /*
+   * verify() function (surprisingly) does not use specific EFI calling convention.
+   * So, it does not need to be tagged with __grub_efi_api attribute.
+   */
+  grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size);
 };
 typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;