Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755454AbbG1Ir5 (ORCPT ); Tue, 28 Jul 2015 04:47:57 -0400 Received: from foss.arm.com ([217.140.101.70]:57107 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932073AbbG1Iri (ORCPT ); Tue, 28 Jul 2015 04:47:38 -0400 Date: Tue, 28 Jul 2015 09:47:40 +0100 From: Will Deacon To: yalin wang Cc: Catalin Marinas , "zlim.lnx@gmail.com" , Punit Agrawal , Marc Zyngier , "lauraa@codeaurora.org" , "wcohen@redhat.com" , "linux-arm-kernel@lists.infradead.org" , open list Subject: Re: [RFC V2] arm64:use set_fixmap_offset to make it more clear Message-ID: <20150728084740.GC29209@arm.com> References: <9A8FA704-5D35-404B-BEBE-C92AF25505C3@gmail.com> <21A5B6D3-B813-4DC3-B392-009991B9CA00@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <21A5B6D3-B813-4DC3-B392-009991B9CA00@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1636 Lines: 47 On Tue, Jul 28, 2015 at 07:31:20AM +0100, yalin wang wrote: > > > On Jul 24, 2015, at 19:52, yalin wang wrote: > > > > A little change to patch_map() function, > > use set_fixmap_offset() to make code more clear. > > > > Signed-off-by: yalin wang > > --- > > arch/arm64/kernel/insn.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c > > index dd9671c..f341866 100644 > > --- a/arch/arm64/kernel/insn.c > > +++ b/arch/arm64/kernel/insn.c > > @@ -101,9 +101,8 @@ static void __kprobes *patch_map(void *addr, int fixmap) > > return addr; > > > > BUG_ON(!page); > > - set_fixmap(fixmap, page_to_phys(page)); > > - > > - return (void *) (__fix_to_virt(fixmap) + (uintaddr & ~PAGE_MASK)); > > + return (void *)set_fixmap_offset(fixmap, page_to_phys(page) + > > + (uintaddr & ~PAGE_MASK)); > > } > > > > static void __kprobes patch_unmap(int fixmap) > > -- > > 1.9.1 > > > Marinas, > this V2 patch can build without warning even CONFIG_DEBUG_SET_MODULE_RONX enabled, > could you review it. > Thanks. I queued this already for 4.3. There's a (benign) sparse warning about the addr parameter to patch_map being overridden by the local scope of set_fixmap_offset which could be solved with a healthy portion of underscores in the core code. Will -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/