Commit bb5af4f6 authored by Mike Rapoport's avatar Mike Rapoport Committed by Andrew Morton
Browse files

mips: rename PGD_ORDER to PGD_TABLE_ORDER 

This is the order of the page table allocation, not the order of a PGD.

While at it remove unused defintion of _PGD_ORDER in asm-offsets.

Link: https://lkml.kernel.org/r/20220703141203.147893-7-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Xuerui Wang <kernel@xen0n.name>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6963c72d

arch/mips/include/asm/pgalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ extern pgd_t *pgd_alloc(struct mm_struct *mm); 


static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)

{

	free_pages((unsigned long)pgd, PGD_ORDER);

	free_pages((unsigned long)pgd, PGD_TABLE_ORDER);

}



#define __pte_free_tlb(tlb,pte,address)			\

arch/mips/include/asm/pgtable-32.h

+3 −3
Original line number Diff line number Diff line
@@ -75,12 +75,12 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, 
 * we don't really have any PUD/PMD directory physically.

 */

#if defined(CONFIG_MIPS_HUGE_TLB_SUPPORT) && !defined(CONFIG_PHYS_ADDR_T_64BIT)

# define __PGD_ORDER	(32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2 + 1)

# define __PGD_TABLE_ORDER (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2 + 1)

#else

# define __PGD_ORDER	(32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2)

# define __PGD_TABLE_ORDER (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2)

#endif



#define PGD_ORDER	(__PGD_ORDER >= 0 ? __PGD_ORDER : 0)

#define PGD_TABLE_ORDER	(__PGD_TABLE_ORDER >= 0 ? __PGD_TABLE_ORDER : 0)

#define PUD_TABLE_ORDER	aieeee_attempt_to_allocate_pud

#define PMD_TABLE_ORDER	aieeee_attempt_to_allocate_pmd

arch/mips/include/asm/pgtable-64.h

+8 −8
Original line number Diff line number Diff line
@@ -85,35 +85,35 @@ 
 */

#ifdef CONFIG_PAGE_SIZE_4KB

# ifdef CONFIG_MIPS_VA_BITS_48

#  define PGD_ORDER		0

#  define PGD_TABLE_ORDER	0

#  define PUD_TABLE_ORDER	0

# else

#  define PGD_ORDER		1

#  define PGD_TABLE_ORDER	1

#  define PUD_TABLE_ORDER	aieeee_attempt_to_allocate_pud

# endif

#define PMD_TABLE_ORDER		0

#endif

#ifdef CONFIG_PAGE_SIZE_8KB

#define PGD_ORDER		0

#define PGD_TABLE_ORDER		0

#define PUD_TABLE_ORDER		aieeee_attempt_to_allocate_pud

#define PMD_TABLE_ORDER		0

#endif

#ifdef CONFIG_PAGE_SIZE_16KB

#ifdef CONFIG_MIPS_VA_BITS_48

#define PGD_ORDER               1

#define PGD_TABLE_ORDER		1

#else

#define PGD_ORDER               0

#define PGD_TABLE_ORDER		0

#endif

#define PUD_TABLE_ORDER		aieeee_attempt_to_allocate_pud

#define PMD_TABLE_ORDER		0

#endif

#ifdef CONFIG_PAGE_SIZE_32KB

#define PGD_ORDER		0

#define PGD_TABLE_ORDER		0

#define PUD_TABLE_ORDER		aieeee_attempt_to_allocate_pud

#define PMD_TABLE_ORDER		0

#endif

#ifdef CONFIG_PAGE_SIZE_64KB

#define PGD_ORDER		0

#define PGD_TABLE_ORDER		0

#define PUD_TABLE_ORDER		aieeee_attempt_to_allocate_pud

#ifdef CONFIG_MIPS_VA_BITS_48

#define PMD_TABLE_ORDER		0
@@ -122,7 +122,7 @@ 
#endif

#endif



#define PTRS_PER_PGD	((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))

#define PTRS_PER_PGD	((PAGE_SIZE << PGD_TABLE_ORDER) / sizeof(pgd_t))

#ifndef __PAGETABLE_PUD_FOLDED

#define PTRS_PER_PUD	((PAGE_SIZE << PUD_TABLE_ORDER) / sizeof(pud_t))

#endif

arch/mips/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ void output_mm_defines(void) 
#endif

	DEFINE(_PTE_T_LOG2, PTE_T_LOG2);

	BLANK();

	DEFINE(_PGD_ORDER, PGD_ORDER);

	BLANK();

	DEFINE(_PMD_SHIFT, PMD_SHIFT);

	DEFINE(_PGDIR_SHIFT, PGDIR_SHIFT);

arch/mips/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ pgd_t *kvm_pgd_alloc(void) 
{

	pgd_t *ret;



	ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGD_ORDER);

	ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGD_TABLE_ORDER);

	if (ret)

		kvm_pgd_init(ret);