mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
mips: rename PMD_ORDER to PMD_TABLE_ORDER
This is the order of the page table allocation, not the order of a PMD. While at it remove unused defintion of _PMD_ORDER in asm-offsets. Link: https://lkml.kernel.org/r/20220703141203.147893-4-rppt@kernel.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Mike 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: Max Filippov <jcmvbkbc@gmail.com> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Xuerui Wang <kernel@xen0n.name> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
f753644235
commit
c94b14bd1c
@ -67,12 +67,12 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
|
||||
pmd_t *pmd;
|
||||
struct page *pg;
|
||||
|
||||
pg = alloc_pages(GFP_KERNEL_ACCOUNT, PMD_ORDER);
|
||||
pg = alloc_pages(GFP_KERNEL_ACCOUNT, PMD_TABLE_ORDER);
|
||||
if (!pg)
|
||||
return NULL;
|
||||
|
||||
if (!pgtable_pmd_page_ctor(pg)) {
|
||||
__free_pages(pg, PMD_ORDER);
|
||||
__free_pages(pg, PMD_TABLE_ORDER);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -82,7 +82,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
|
||||
|
||||
#define PGD_ORDER (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
|
||||
#define PUD_ORDER aieeee_attempt_to_allocate_pud
|
||||
#define PMD_ORDER aieeee_attempt_to_allocate_pmd
|
||||
#define PMD_TABLE_ORDER aieeee_attempt_to_allocate_pmd
|
||||
#define PTE_ORDER 0
|
||||
|
||||
#define PTRS_PER_PGD (USER_PTRS_PER_PGD * 2)
|
||||
|
@ -51,12 +51,12 @@
|
||||
#define PMD_MASK (~(PMD_SIZE-1))
|
||||
|
||||
# ifdef __PAGETABLE_PUD_FOLDED
|
||||
# define PGDIR_SHIFT (PMD_SHIFT + (PAGE_SHIFT + PMD_ORDER - 3))
|
||||
# define PGDIR_SHIFT (PMD_SHIFT + (PAGE_SHIFT + PMD_TABLE_ORDER - 3))
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef __PAGETABLE_PUD_FOLDED
|
||||
#define PUD_SHIFT (PMD_SHIFT + (PAGE_SHIFT + PMD_ORDER - 3))
|
||||
#define PUD_SHIFT (PMD_SHIFT + (PAGE_SHIFT + PMD_TABLE_ORDER - 3))
|
||||
#define PUD_SIZE (1UL << PUD_SHIFT)
|
||||
#define PUD_MASK (~(PUD_SIZE-1))
|
||||
#define PGDIR_SHIFT (PUD_SHIFT + (PAGE_SHIFT + PUD_ORDER - 3))
|
||||
@ -91,13 +91,13 @@
|
||||
# define PGD_ORDER 1
|
||||
# define PUD_ORDER aieeee_attempt_to_allocate_pud
|
||||
# endif
|
||||
#define PMD_ORDER 0
|
||||
#define PMD_TABLE_ORDER 0
|
||||
#define PTE_ORDER 0
|
||||
#endif
|
||||
#ifdef CONFIG_PAGE_SIZE_8KB
|
||||
#define PGD_ORDER 0
|
||||
#define PUD_ORDER aieeee_attempt_to_allocate_pud
|
||||
#define PMD_ORDER 0
|
||||
#define PMD_TABLE_ORDER 0
|
||||
#define PTE_ORDER 0
|
||||
#endif
|
||||
#ifdef CONFIG_PAGE_SIZE_16KB
|
||||
@ -107,22 +107,22 @@
|
||||
#define PGD_ORDER 0
|
||||
#endif
|
||||
#define PUD_ORDER aieeee_attempt_to_allocate_pud
|
||||
#define PMD_ORDER 0
|
||||
#define PMD_TABLE_ORDER 0
|
||||
#define PTE_ORDER 0
|
||||
#endif
|
||||
#ifdef CONFIG_PAGE_SIZE_32KB
|
||||
#define PGD_ORDER 0
|
||||
#define PUD_ORDER aieeee_attempt_to_allocate_pud
|
||||
#define PMD_ORDER 0
|
||||
#define PMD_TABLE_ORDER 0
|
||||
#define PTE_ORDER 0
|
||||
#endif
|
||||
#ifdef CONFIG_PAGE_SIZE_64KB
|
||||
#define PGD_ORDER 0
|
||||
#define PUD_ORDER aieeee_attempt_to_allocate_pud
|
||||
#ifdef CONFIG_MIPS_VA_BITS_48
|
||||
#define PMD_ORDER 0
|
||||
#define PMD_TABLE_ORDER 0
|
||||
#else
|
||||
#define PMD_ORDER aieeee_attempt_to_allocate_pmd
|
||||
#define PMD_TABLE_ORDER aieeee_attempt_to_allocate_pmd
|
||||
#endif
|
||||
#define PTE_ORDER 0
|
||||
#endif
|
||||
@ -132,7 +132,7 @@
|
||||
#define PTRS_PER_PUD ((PAGE_SIZE << PUD_ORDER) / sizeof(pud_t))
|
||||
#endif
|
||||
#ifndef __PAGETABLE_PMD_FOLDED
|
||||
#define PTRS_PER_PMD ((PAGE_SIZE << PMD_ORDER) / sizeof(pmd_t))
|
||||
#define PTRS_PER_PMD ((PAGE_SIZE << PMD_TABLE_ORDER) / sizeof(pmd_t))
|
||||
#endif
|
||||
#define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t))
|
||||
|
||||
|
@ -197,9 +197,6 @@ void output_mm_defines(void)
|
||||
DEFINE(_PTE_T_LOG2, PTE_T_LOG2);
|
||||
BLANK();
|
||||
DEFINE(_PGD_ORDER, PGD_ORDER);
|
||||
#ifndef __PAGETABLE_PMD_FOLDED
|
||||
DEFINE(_PMD_ORDER, PMD_ORDER);
|
||||
#endif
|
||||
DEFINE(_PTE_ORDER, PTE_ORDER);
|
||||
BLANK();
|
||||
DEFINE(_PMD_SHIFT, PMD_SHIFT);
|
||||
|
Loading…
Reference in New Issue
Block a user