Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946101AbbEOPy4 (ORCPT ); Fri, 15 May 2015 11:54:56 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:39769 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946068AbbEOPyw (ORCPT ); Fri, 15 May 2015 11:54:52 -0400 From: "Aneesh Kumar K.V" To: akpm@linux-foundation.org, benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, kirill.shutemov@linux.intel.com, aarcange@redhat.com, schwidefsky@de.ibm.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH V5 1/3] mm/thp: Split out pmd collpase flush into a separate functions In-Reply-To: <1431704550-19937-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1431704550-19937-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <1431704550-19937-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com> User-Agent: Notmuch/0.19+103~g294bb6d (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Fri, 15 May 2015 21:24:43 +0530 Message-ID: <871tihn8e4.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15051515-0025-0000-0000-000004D47FA7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1904 Lines: 57 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h > index 39f1d6a2b04d..acdcaac77d93 100644 > --- a/include/asm-generic/pgtable.h > +++ b/include/asm-generic/pgtable.h > @@ -189,6 +189,28 @@ extern void pmdp_splitting_flush(struct vm_area_struct *vma, > unsigned long address, pmd_t *pmdp); > #endif > > +#ifndef pmdp_collapse_flush > +#define pmdp_collapse_flush pmdp_collapse_flush > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > +static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, > + unsigned long address, > + pmd_t *pmdp) extra pmdp_collapse_flush #define here > +{ > + return pmdp_clear_flush(vma, address, pmdp); > +} > +#define pmdp_collapse_flush pmdp_collapse_flush > +#else > +static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, > + unsigned long address, > + pmd_t *pmdp) > +{ > + BUILD_BUG(); > + return *pmdp; > +} > +#define pmdp_collapse_flush pmdp_collapse_flush > +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > +#endif > + > #ifndef __HAVE_ARCH_PGTABLE_DEPOSIT > extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp, > pgtable_t pgtable); diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index acdcaac77d93..2c3ca89e9aee 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -190,7 +190,6 @@ extern void pmdp_splitting_flush(struct vm_area_struct *vma, #endif #ifndef pmdp_collapse_flush -#define pmdp_collapse_flush pmdp_collapse_flush #ifdef CONFIG_TRANSPARENT_HUGEPAGE static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, unsigned long address, -- 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/