diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2020-05-23 11:01:57 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2020-05-23 11:01:57 +0200 |
| commit | 6e99d3213b10ee18428d6d20715ad6c0e89ead4d (patch) | |
| tree | 95b6b4177f0574cdfcb9e24b2ad86f25af2ca57c /arch | |
| parent | d8bd8c6e2cfab8b78b537715255be8d7557791c0 (diff) | |
| download | lwn-6e99d3213b10ee18428d6d20715ad6c0e89ead4d.tar.gz lwn-6e99d3213b10ee18428d6d20715ad6c0e89ead4d.zip | |
efi/libstub: Add missing prototype for PE/COFF entry point
Fix a missing prototype warning by adding a forward declaration
for the PE/COFF entrypoint, and while at it, align the function
name between the x86 and ARM versions of the stub.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/compressed/efi-header.S | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/efi-entry.S | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/efi-header.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/compressed/efi-header.S b/arch/arm/boot/compressed/efi-header.S index 62286da318e7..c0e7a745103e 100644 --- a/arch/arm/boot/compressed/efi-header.S +++ b/arch/arm/boot/compressed/efi-header.S @@ -60,7 +60,7 @@ optional_header: .long __pecoff_code_size @ SizeOfCode .long __pecoff_data_size @ SizeOfInitializedData .long 0 @ SizeOfUninitializedData - .long efi_entry - start @ AddressOfEntryPoint + .long efi_pe_entry - start @ AddressOfEntryPoint .long start_offset @ BaseOfCode .long __pecoff_data_start - start @ BaseOfData diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S index 1a03618df0df..5664af1e9260 100644 --- a/arch/arm64/kernel/efi-entry.S +++ b/arch/arm64/kernel/efi-entry.S @@ -14,7 +14,7 @@ SYM_CODE_START(efi_enter_kernel) /* - * efi_entry() will have copied the kernel image if necessary and we + * efi_pe_entry() will have copied the kernel image if necessary and we * end up here with device tree address in x1 and the kernel entry * point stored in x0. Save those values in registers which are * callee preserved. diff --git a/arch/arm64/kernel/efi-header.S b/arch/arm64/kernel/efi-header.S index 914999ccaf8a..f2457d4b76a4 100644 --- a/arch/arm64/kernel/efi-header.S +++ b/arch/arm64/kernel/efi-header.S @@ -27,7 +27,7 @@ optional_header: .long __initdata_begin - efi_header_end // SizeOfCode .long __pecoff_data_size // SizeOfInitializedData .long 0 // SizeOfUninitializedData - .long __efistub_efi_entry - _head // AddressOfEntryPoint + .long __efistub_efi_pe_entry - _head // AddressOfEntryPoint .long efi_header_end - _head // BaseOfCode extra_header_fields: |