On Mon, Aug 18, 2014 at 02:30:07AM +0100, Dave Young wrote: > In case efi runtime disabled via noefi kernel cmdline arm64_enter_virtual_mode > should error out. > > At the same time move early_memunmap(memmap.map, mapsize) to the beginning of > the function or it will leak early mem. > > Signed-off-by: Dave Young <[email protected]> > --- > arch/arm64/kernel/efi.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c > index 6ed0362..8f5db4a 100644 > --- a/arch/arm64/kernel/efi.c > +++ b/arch/arm64/kernel/efi.c > @@ -392,11 +392,16 @@ static int __init arm64_enter_virtual_mode(void) > return -1; > } > > - pr_info("Remapping and enabling EFI services.\n"); > - > - /* replace early memmap mapping with permanent mapping */ > mapsize = memmap.map_end - memmap.map; > early_memunmap(memmap.map, mapsize); > + > + if (efi_runtime_disabled()) { > + pr_info("EFI runtime services will be disabled.\n"); > + return -1; > + } > + > + pr_info("Remapping and enabling EFI services.\n"); > + /* replace early memmap mapping with permanent mapping */ > memmap.map = (__force void *)ioremap_cache((phys_addr_t)memmap.phys_map, > mapsize); > memmap.map_end = memmap.map + mapsize;
This looks better, thanks: Reviewed-by: Will Deacon <[email protected]> Are you sending these via the efi tree as part of this series, or do you need me to pick anything up into the arm64 tree? Will -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
