From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754563Ab2IRTdi (ORCPT ); Tue, 18 Sep 2012 15:33:38 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:37454 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754427Ab2IRTdd (ORCPT ); Tue, 18 Sep 2012 15:33:33 -0400 Date: Tue, 18 Sep 2012 12:33:31 -0700 From: Andrew Morton To: Ralf Baechle Cc: Will Deacon , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, mhocko@suse.cz, Catalin Marinas , Steve Capper Subject: Re: [PATCH 2/3] mm: thp: Fix the update_mmu_cache() last argument passing in mm/huge_memory.c Message-Id: <20120918123331.6ca5833c.akpm@linux-foundation.org> In-Reply-To: <20120915133833.GA32398@linux-mips.org> References: <1347382036-18455-1-git-send-email-will.deacon@arm.com> <1347382036-18455-3-git-send-email-will.deacon@arm.com> <20120915133833.GA32398@linux-mips.org> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 15 Sep 2012 15:38:33 +0200 Ralf Baechle wrote: > On Tue, Sep 11, 2012 at 05:47:15PM +0100, Will Deacon wrote: > > > The update_mmu_cache() takes a pointer (to pte_t by default) as the last > > argument but the huge_memory.c passes a pmd_t value. The patch changes > > the argument to the pmd_t * pointer. > > > > Signed-off-by: Catalin Marinas > > Signed-off-by: Steve Capper > > Signed-off-by: Will Deacon > > --- > > mm/huge_memory.c | 6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > index 57c4b93..4aa6d02 100644 > > --- a/mm/huge_memory.c > > +++ b/mm/huge_memory.c > > @@ -934,7 +934,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, > > entry = pmd_mkyoung(orig_pmd); > > entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); > > if (pmdp_set_access_flags(vma, haddr, pmd, entry, 1)) > > - update_mmu_cache(vma, address, entry); > > + update_mmu_cache(vma, address, pmd); > > Documentation/cachetlb.txt will need an update as well. Currently it says: > > 5) void update_mmu_cache(struct vm_area_struct *vma, > unsigned long address, pte_t *ptep) Yes please. > I would prefer we introduce something like update_mmu_cache_huge_page(vma, > address, pmd) and leave the classic update_mmu_cache() unchanged. Why?