| Message ID | 1413230189-3721-1-git-send-email-roy.franz@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, Oct 14, 2014 at 1:26 AM, Roy Franz <roy.franz@linaro.org> wrote: > A stray call to blexit() was in the normal processing path for handling > FDTs specified in the config file, causing the EFI boot code to > unconditionally exit. Remove the blexit() call as it should never > have been here. > > Signed-off-by: Roy Franz <roy.franz@linaro.org> > --- > xen/arch/arm/efi/efi-boot.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h > index 61cb13a..7abc059 100644 > --- a/xen/arch/arm/efi/efi-boot.h > +++ b/xen/arch/arm/efi/efi-boot.h > @@ -359,7 +359,6 @@ static void __init efi_arch_cfg_file_early(EFI_FILE_HANDLE dir_handle, char *sec > { > split_string(name.s); > read_file(dir_handle, s2w(&name), &dtbfile, NULL); > - blexit(NULL); > efi_bs->FreePool(name.w); > } > fdt = fdt_increase_size(&dtbfile, cfg.size + EFI_PAGE_SIZE); > -- > 1.9.1 Tested-by: Vijaya Kumar K<Vijaya.Kumar@caviumnetworks.com>
On Tue, 2014-10-14 at 11:51 +0530, Vijay Kilari wrote: > On Tue, Oct 14, 2014 at 1:26 AM, Roy Franz <roy.franz@linaro.org> wrote: > > A stray call to blexit() was in the normal processing path for handling > > FDTs specified in the config file, causing the EFI boot code to > > unconditionally exit. Remove the blexit() call as it should never > > have been here. > > > Tested-by: Vijaya Kumar K<Vijaya.Kumar@caviumnetworks.com> Acked + applied, thanks.
diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 61cb13a..7abc059 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -359,7 +359,6 @@ static void __init efi_arch_cfg_file_early(EFI_FILE_HANDLE dir_handle, char *sec { split_string(name.s); read_file(dir_handle, s2w(&name), &dtbfile, NULL); - blexit(NULL); efi_bs->FreePool(name.w); } fdt = fdt_increase_size(&dtbfile, cfg.size + EFI_PAGE_SIZE);
A stray call to blexit() was in the normal processing path for handling FDTs specified in the config file, causing the EFI boot code to unconditionally exit. Remove the blexit() call as it should never have been here. Signed-off-by: Roy Franz <roy.franz@linaro.org> --- xen/arch/arm/efi/efi-boot.h | 1 - 1 file changed, 1 deletion(-)