Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d4320f3 authored by Jon Tollefson's avatar Jon Tollefson Committed by Paul Mackerras
Browse files

powerpc: Hugetlb pgtable cache access cleanup 



Andrew Morton suggested that using a macro that makes an array
reference look like a function call makes it harder to understand the
code.

This therefore removes the huge_pgtable_cache(psize) macro and
replaces its uses with pgtable_cache[HUGE_PGTABLE_INDEX(psize)].

Signed-off-by: default avatarJon Tollefson <kniht@linux.vnet.ibm.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d4ad3048

arch/powerpc/mm/hugetlbpage.c

+11 −11
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ unsigned int mmu_huge_psizes[MMU_PAGE_COUNT] = { }; /* initialize all to 0 */ 


/* Subtract one from array size because we don't need a cache for 4K since

 * is not a huge page size */

#define huge_pgtable_cache(psize)	(pgtable_cache[HUGEPTE_CACHE_NUM \

							+ psize-1])

#define HUGE_PGTABLE_INDEX(psize)	(HUGEPTE_CACHE_NUM + psize - 1)

#define HUGEPTE_CACHE_NAME(psize)	(huge_pgtable_cache_name[psize])



static const char *huge_pgtable_cache_name[MMU_PAGE_COUNT] = {
@@ -113,7 +112,7 @@ static inline pte_t *hugepte_offset(hugepd_t *hpdp, unsigned long addr, 
static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,

			   unsigned long address, unsigned int psize)

{

	pte_t *new = kmem_cache_zalloc(huge_pgtable_cache(psize),

	pte_t *new = kmem_cache_zalloc(pgtable_cache[HUGE_PGTABLE_INDEX(psize)],

				      GFP_KERNEL|__GFP_REPEAT);



	if (! new)
@@ -121,7 +120,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp, 


	spin_lock(&mm->page_table_lock);

	if (!hugepd_none(*hpdp))

		kmem_cache_free(huge_pgtable_cache(psize), new);

		kmem_cache_free(pgtable_cache[HUGE_PGTABLE_INDEX(psize)], new);

	else

		hpdp->pd = (unsigned long)new | HUGEPD_OK;

	spin_unlock(&mm->page_table_lock);
@@ -760,13 +759,14 @@ static int __init hugetlbpage_init(void) 


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

		if (mmu_huge_psizes[psize]) {

			huge_pgtable_cache(psize) = kmem_cache_create(

			pgtable_cache[HUGE_PGTABLE_INDEX(psize)] =

				kmem_cache_create(

					HUGEPTE_CACHE_NAME(psize),

					HUGEPTE_TABLE_SIZE(psize),

					HUGEPTE_TABLE_SIZE(psize),

					0,

					NULL);

			if (!huge_pgtable_cache(psize))

			if (!pgtable_cache[HUGE_PGTABLE_INDEX(psize)])

				panic("hugetlbpage_init(): could not create %s"\

				      "\n", HUGEPTE_CACHE_NAME(psize));

		}