Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934150AbcDMINB (ORCPT ); Wed, 13 Apr 2016 04:13:01 -0400 Received: from mail-ig0-f174.google.com ([209.85.213.174]:38813 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934086AbcDMIM5 (ORCPT ); Wed, 13 Apr 2016 04:12:57 -0400 MIME-Version: 1.0 In-Reply-To: <20160412200119.GH2829@codeblueprint.co.uk> References: <1460379809-18490-1-git-send-email-matt@codeblueprint.co.uk> <1460379809-18490-3-git-send-email-matt@codeblueprint.co.uk> <20160412200119.GH2829@codeblueprint.co.uk> Date: Wed, 13 Apr 2016 10:12:56 +0200 Message-ID: Subject: Re: [PATCH 2/2] efi: Remove global 'memmap' From: Ard Biesheuvel To: Matt Fleming Cc: "linux-efi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Tony Luck , "Luck, Tony" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1302 Lines: 31 On 12 April 2016 at 22:01, Matt Fleming wrote: > 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? Yes, please. Russell seems to be dragging his feet a bit, but I should still be able to get that patch out in time for v4.7 (and the memattr stuff for ARM relies on it anyway)