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.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: "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: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index 0ef245cfcae96fcf678c4a25f1f0c0e9298a313f..1ef8e86ae565599173c29b00822d33d91a002340 100644 (file)
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -91,7 +91,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)
 {
        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)
                pud_init((unsigned long)pud, (unsigned long)invalid_pmd_table);
        return pud;

diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
index 8d57bd5b0b94c470f06ca581245b899bbd3b8bd4..d9ae244a4fce6a8b5e8f1e8a1901cdd6b1d5c355 100644 (file)
--- a/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
@@ -81,7 +81,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
 #endif
 
 #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 PTE_ORDER      0
 

diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
index ae0d5a09064daa02a754b81a80e91adbc9078389..7daf9a6509d8acef445e859821380b9ac1cc3d40 100644 (file)
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -59,7 +59,7 @@
 #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))
+#define PGDIR_SHIFT    (PUD_SHIFT + (PAGE_SHIFT + PUD_TABLE_ORDER - 3))
 #endif
 
 #define PGDIR_SIZE     (1UL << PGDIR_SHIFT)
@@ -86,17 +86,17 @@
 #ifdef CONFIG_PAGE_SIZE_4KB
 # ifdef CONFIG_MIPS_VA_BITS_48
 #  define PGD_ORDER            0
-#  define PUD_ORDER            0
+#  define PUD_TABLE_ORDER              0
 # else
 #  define PGD_ORDER            1
-#  define PUD_ORDER            aieeee_attempt_to_allocate_pud
+#  define PUD_TABLE_ORDER              aieeee_attempt_to_allocate_pud
 # endif
 #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 PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #define PMD_TABLE_ORDER                0
 #define PTE_ORDER              0
 #endif
@@ -106,19 +106,19 @@
 #else
 #define PGD_ORDER               0
 #endif
-#define PUD_ORDER              aieeee_attempt_to_allocate_pud
+#define PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #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 PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #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
+#define PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #ifdef CONFIG_MIPS_VA_BITS_48
 #define PMD_TABLE_ORDER                0
 #else
@@ -129,7 +129,7 @@
 
 #define PTRS_PER_PGD   ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))
 #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
 #ifndef __PAGETABLE_PMD_FOLDED
 #define PTRS_PER_PMD   ((PAGE_SIZE << PMD_TABLE_ORDER) / sizeof(pmd_t))