Re: [PATCH 2/2] efi: Remove global 'memmap'

Matt Fleming
2016-04-12T20:01:25Z

On Mon, 11 Apr, at 03:17:55PM, Ard Biesheuvel wrote:
> > diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
> > index 1cfbfaf57a2d..0416d5d33e74 100644
> > --- a/drivers/firmware/efi/arm-runtime.c
> > +++ b/drivers/firmware/efi/arm-runtime.c
> > @@ -89,6 +89,7 @@ static bool __init efi_virtmap_init(void)
> > */
> > static int __init arm_enable_runtime_services(void)
> > {
> > + phys_addr_t phys_map;
>
> Is the sole purpose of this variable to prevent breaking the 80-column rule?

Indeed it is.

> If so, please be aware that I intend to propose a patch that replaces
> the ioremap_cache() below with a call to memremap(), but this is
> another change that is gated by Russell merging my memremap patches
> for ARM

OK. Would you like me to drop this particular hunk and just go with,

efi.memmap.map = (__force void *)ioremap_cache(efi.memmap.phys_map,
mapsize);

if you're going to rewrite it soon anyway?