From: Arvind Sankar <nivedita@alum.mit.edu>
Date: Sun, 8 Mar 2020 09:08:40 +0100
Subject: efi/x86: Annotate the LOADED_IMAGE_PROTOCOL_GUID with SYM_DATA
Patch-mainline: v5.7-rc1
Git-commit: 3cdcd6899eaf454b2539c624fff5daf63c175a7a
References: jsc#SLE-16407
Use SYM_DATA*() macros to annotate this constant, and explicitly align it
to 4-byte boundary. Use lower-case for hexadecimal data.
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200301230436.2246909-2-nivedita@alum.mit.edu
Link: https://lore.kernel.org/r/20200308080859.21568-10-ardb@kernel.org
Acked-by: Lee, Chun-Yi <jlee@suse.com>
---
arch/x86/boot/compressed/head_64.S | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -670,7 +670,7 @@ SYM_FUNC_START(efi32_pe_entry)
/* Get the loaded image protocol pointer from the image handle */
subl $12, %esp // space for the loaded image pointer
pushl %esp // pass its address
- leal 4f(%ebp), %eax
+ leal loaded_image_proto(%ebp), %eax
pushl %eax // pass the GUID address
pushl 28(%esp) // pass the image handle
@@ -693,9 +693,12 @@ SYM_FUNC_END(efi32_pe_entry)
.section ".rodata"
/* EFI loaded image protocol GUID */
-4: .long 0x5B1B31A1
+ .balign 4
+SYM_DATA_START_LOCAL(loaded_image_proto)
+ .long 0x5b1b31a1
.word 0x9562, 0x11d2
- .byte 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B
+ .byte 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
+SYM_DATA_END(loaded_image_proto)
#endif
/*