On Sun, Feb 11, 2018 at 08:30:07PM +0530, Aneesh Kumar K.V wrote: > Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/book3s/64/hash-64k.h | 2 +- > arch/powerpc/include/asm/book3s/64/hash.h | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h > b/arch/powerpc/include/asm/book3s/64/hash-64k.h > index c08b3b032ec0..ee440fb3d240 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash-64k.h > +++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h > @@ -140,7 +140,7 @@ static inline int hash__remap_4k_pfn(struct > vm_area_struct *vma, unsigned long a > } > > #define H_PTE_TABLE_SIZE PTE_FRAG_SIZE > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined (CONFIG_HUGETLB_PAGE) > #define H_PMD_TABLE_SIZE ((sizeof(pmd_t) << PMD_INDEX_SIZE) + \ > (sizeof(unsigned long) << PMD_INDEX_SIZE)) > #else > diff --git a/arch/powerpc/include/asm/book3s/64/hash.h > b/arch/powerpc/include/asm/book3s/64/hash.h > index 234f141fb151..0851c328bea6 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash.h > +++ b/arch/powerpc/include/asm/book3s/64/hash.h > @@ -23,7 +23,8 @@ > H_PUD_INDEX_SIZE + H_PGD_INDEX_SIZE + > PAGE_SHIFT) > #define H_PGTABLE_RANGE (ASM_CONST(1) << H_PGTABLE_EADDR_SIZE) > > -#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && defined(CONFIG_PPC_64K_PAGES) > +#if (defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLB_PAGE)) > && \ > + defined(CONFIG_PPC_64K_PAGES) > /* > * only with hash 64k we need to use the second half of pmd page table > * to store pointer to deposited pgtable_t
A small nitpick. the definition of H_PMD_CACHE_INDEX and H_PUD_CACHE_INDEX (introduced in the previous patch) can be nested under #ifdef CONFIG_PPC_64K_PAGES Reviewed-by: Ram Pai <linux...@us.ibm.com>
