| Message ID | 1404305683-26501-2-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 6091c9c447370c4717ec9975813c874af490eb36 |
| Headers | show |
On Wed, Jul 2, 2014 at 5:54 AM, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > As EFI_ERROR is not a UEFI result code but a local invention only > intended to allow get_dram_base() to signal failure, we should not use > it elsewhere. > > Replace with EFI_LOAD_ERROR. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Signed-off-by: Matt Fleming <matt.fleming@intel.com> > --- > arch/arm64/kernel/efi-stub.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c > index e786e6cdc400..7aa7155a9740 100644 > --- a/arch/arm64/kernel/efi-stub.c > +++ b/arch/arm64/kernel/efi-stub.c > @@ -69,7 +69,7 @@ static efi_status_t handle_kernel_image(efi_system_table_t *sys_table, > if (*image_addr != (dram_base + TEXT_OFFSET)) { > pr_efi_err(sys_table, "Failed to alloc kernel memory\n"); > efi_free(sys_table, kernel_memsize, *image_addr); > - return EFI_ERROR; > + return EFI_LOAD_ERROR; > } > *image_size = kernel_memsize; > } > -- > 1.8.3.2 > Looks good. Acked-by: Roy Franz <roy.franz@linaro.org>
diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c index e786e6cdc400..7aa7155a9740 100644 --- a/arch/arm64/kernel/efi-stub.c +++ b/arch/arm64/kernel/efi-stub.c @@ -69,7 +69,7 @@ static efi_status_t handle_kernel_image(efi_system_table_t *sys_table, if (*image_addr != (dram_base + TEXT_OFFSET)) { pr_efi_err(sys_table, "Failed to alloc kernel memory\n"); efi_free(sys_table, kernel_memsize, *image_addr); - return EFI_ERROR; + return EFI_LOAD_ERROR; } *image_size = kernel_memsize; }