Commit 4df4b275 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: cleanup remaining ifdef mess in hugetlbpage.c 



Only 3 subarches support huge pages. So when it is either 2 of them,
it is not the third one.

And mmu_has_feature() is known by all subarches so IS_ENABLED() can
be used instead of #ifdef

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c5710cd2

arch/powerpc/mm/hugetlbpage.c

+5 −7
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ int __init alloc_bootmem_huge_page(struct hstate *h) 
	return __alloc_bootmem_huge_page(h);

}



#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)

#ifndef CONFIG_PPC_BOOK3S_64

#define HUGEPD_FREELIST_SIZE \

	((PAGE_SIZE - sizeof(struct hugepd_freelist)) / sizeof(pte_t))
@@ -595,10 +595,10 @@ static int __init hugetlbpage_init(void) 
		return 0;

	}



#if !defined(CONFIG_PPC_FSL_BOOK3E) && !defined(CONFIG_PPC_8xx)

	if (!radix_enabled() && !mmu_has_feature(MMU_FTR_16M_PAGE))

	if (IS_ENABLED(CONFIG_PPC_BOOK3S_64) && !radix_enabled() &&

	    !mmu_has_feature(MMU_FTR_16M_PAGE))

		return -ENODEV;

#endif



	for (psize = 0; psize < MMU_PAGE_COUNT; ++psize) {

		unsigned shift;

		unsigned pdshift;
@@ -636,10 +636,8 @@ static int __init hugetlbpage_init(void) 
			pgtable_cache_add(PTE_INDEX_SIZE);

		else if (pdshift > shift)

			pgtable_cache_add(pdshift - shift);

#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_8xx)

		else

		else if (IS_ENABLED(CONFIG_PPC_FSL_BOOK3E) || IS_ENABLED(CONFIG_PPC_8xx))

			pgtable_cache_add(PTE_T_ORDER);

#endif

	}



	if (IS_ENABLED(HUGETLB_PAGE_SIZE_VARIABLE))

CRA Git | Maintained and supported by SUSTech CRA and CCSE