Commit 8e20a4de authored by Mike Rapoport's avatar Mike Rapoport Committed by akpm

mips: rename PUD_ORDER to PUD_TABLE_ORDER

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

Link: https://lkml.kernel.org/r/20220703141203.147893-5-rppt@kernel.orgSigned-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 c94b14bd
...@@ -91,7 +91,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address) ...@@ -91,7 +91,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)
{ {
pud_t *pud; pud_t *pud;
pud = (pud_t *) __get_free_pages(GFP_KERNEL, PUD_ORDER); pud = (pud_t *) __get_free_pages(GFP_KERNEL, PUD_TABLE_ORDER);
if (pud) if (pud)
pud_init((unsigned long)pud, (unsigned long)invalid_pmd_table); pud_init((unsigned long)pud, (unsigned long)invalid_pmd_table);
return pud; return pud;
......
...@@ -81,7 +81,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, ...@@ -81,7 +81,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
#endif #endif
#define PGD_ORDER (__PGD_ORDER >= 0 ? __PGD_ORDER : 0) #define PGD_ORDER (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
#define PUD_ORDER aieeee_attempt_to_allocate_pud #define PUD_TABLE_ORDER aieeee_attempt_to_allocate_pud
#define PMD_TABLE_ORDER aieeee_attempt_to_allocate_pmd #define PMD_TABLE_ORDER aieeee_attempt_to_allocate_pmd
#define PTE_ORDER 0 #define PTE_ORDER 0
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#define PUD_SHIFT (PMD_SHIFT + (PAGE_SHIFT + PMD_TABLE_ORDER - 3)) #define PUD_SHIFT (PMD_SHIFT + (PAGE_SHIFT + PMD_TABLE_ORDER - 3))
#define PUD_SIZE (1UL << PUD_SHIFT) #define PUD_SIZE (1UL << PUD_SHIFT)
#define PUD_MASK (~(PUD_SIZE-1)) #define PUD_MASK (~(PUD_SIZE-1))
#define PGDIR_SHIFT (PUD_SHIFT + (PAGE_SHIFT + PUD_ORDER - 3)) #define PGDIR_SHIFT (PUD_SHIFT + (PAGE_SHIFT + PUD_TABLE_ORDER - 3))
#endif #endif
#define PGDIR_SIZE (1UL << PGDIR_SHIFT) #define PGDIR_SIZE (1UL << PGDIR_SHIFT)
...@@ -86,17 +86,17 @@ ...@@ -86,17 +86,17 @@
#ifdef CONFIG_PAGE_SIZE_4KB #ifdef CONFIG_PAGE_SIZE_4KB
# ifdef CONFIG_MIPS_VA_BITS_48 # ifdef CONFIG_MIPS_VA_BITS_48
# define PGD_ORDER 0 # define PGD_ORDER 0
# define PUD_ORDER 0 # define PUD_TABLE_ORDER 0
# else # else
# define PGD_ORDER 1 # define PGD_ORDER 1
# define PUD_ORDER aieeee_attempt_to_allocate_pud # define PUD_TABLE_ORDER aieeee_attempt_to_allocate_pud
# endif # endif
#define PMD_TABLE_ORDER 0 #define PMD_TABLE_ORDER 0
#define PTE_ORDER 0 #define PTE_ORDER 0
#endif #endif
#ifdef CONFIG_PAGE_SIZE_8KB #ifdef CONFIG_PAGE_SIZE_8KB
#define PGD_ORDER 0 #define PGD_ORDER 0
#define PUD_ORDER aieeee_attempt_to_allocate_pud #define PUD_TABLE_ORDER aieeee_attempt_to_allocate_pud
#define PMD_TABLE_ORDER 0 #define PMD_TABLE_ORDER 0
#define PTE_ORDER 0 #define PTE_ORDER 0
#endif #endif
...@@ -106,19 +106,19 @@ ...@@ -106,19 +106,19 @@
#else #else
#define PGD_ORDER 0 #define PGD_ORDER 0
#endif #endif
#define PUD_ORDER aieeee_attempt_to_allocate_pud #define PUD_TABLE_ORDER aieeee_attempt_to_allocate_pud
#define PMD_TABLE_ORDER 0 #define PMD_TABLE_ORDER 0
#define PTE_ORDER 0 #define PTE_ORDER 0
#endif #endif
#ifdef CONFIG_PAGE_SIZE_32KB #ifdef CONFIG_PAGE_SIZE_32KB
#define PGD_ORDER 0 #define PGD_ORDER 0
#define PUD_ORDER aieeee_attempt_to_allocate_pud #define PUD_TABLE_ORDER aieeee_attempt_to_allocate_pud
#define PMD_TABLE_ORDER 0 #define PMD_TABLE_ORDER 0
#define PTE_ORDER 0 #define PTE_ORDER 0
#endif #endif
#ifdef CONFIG_PAGE_SIZE_64KB #ifdef CONFIG_PAGE_SIZE_64KB
#define PGD_ORDER 0 #define PGD_ORDER 0
#define PUD_ORDER aieeee_attempt_to_allocate_pud #define PUD_TABLE_ORDER aieeee_attempt_to_allocate_pud
#ifdef CONFIG_MIPS_VA_BITS_48 #ifdef CONFIG_MIPS_VA_BITS_48
#define PMD_TABLE_ORDER 0 #define PMD_TABLE_ORDER 0
#else #else
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
#define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t)) #define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))
#ifndef __PAGETABLE_PUD_FOLDED #ifndef __PAGETABLE_PUD_FOLDED
#define PTRS_PER_PUD ((PAGE_SIZE << PUD_ORDER) / sizeof(pud_t)) #define PTRS_PER_PUD ((PAGE_SIZE << PUD_TABLE_ORDER) / sizeof(pud_t))
#endif #endif
#ifndef __PAGETABLE_PMD_FOLDED #ifndef __PAGETABLE_PMD_FOLDED
#define PTRS_PER_PMD ((PAGE_SIZE << PMD_TABLE_ORDER) / sizeof(pmd_t)) #define PTRS_PER_PMD ((PAGE_SIZE << PMD_TABLE_ORDER) / sizeof(pmd_t))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment