Skip to content

Commit 3cdcd68

Browse files
nivedita76Ingo Molnar
authored andcommitted
efi/x86: Annotate the LOADED_IMAGE_PROTOCOL_GUID with SYM_DATA
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 <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent f9834f1 commit 3cdcd68

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

arch/x86/boot/compressed/head_64.S

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ SYM_FUNC_START(efi32_pe_entry)
672672
/* Get the loaded image protocol pointer from the image handle */
673673
subl $12, %esp // space for the loaded image pointer
674674
pushl %esp // pass its address
675-
leal 4f(%ebp), %eax
675+
leal loaded_image_proto(%ebp), %eax
676676
pushl %eax // pass the GUID address
677677
pushl 28(%esp) // pass the image handle
678678

@@ -695,9 +695,12 @@ SYM_FUNC_END(efi32_pe_entry)
695695

696696
.section ".rodata"
697697
/* EFI loaded image protocol GUID */
698-
4: .long 0x5B1B31A1
698+
.balign 4
699+
SYM_DATA_START_LOCAL(loaded_image_proto)
700+
.long 0x5b1b31a1
699701
.word 0x9562, 0x11d2
700-
.byte 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B
702+
.byte 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
703+
SYM_DATA_END(loaded_image_proto)
701704
#endif
702705

703706
/*

0 commit comments

Comments
 (0)