]> git.baikalelectronics.ru Git - kernel.git/commitdiff
loongarch: drop definition of PUD_ORDER
authorMike Rapoport <rppt@linux.ibm.com>
Sun, 3 Jul 2022 14:12:00 +0000 (17:12 +0300)
committerakpm <akpm@linux-foundation.org>
Mon, 18 Jul 2022 00:14:43 +0000 (17:14 -0700)
This is the order of the page table allocation, not the order of a PUD.
Since its always hardwired to 0, simply drop it.

Link: https://lkml.kernel.org/r/20220703141203.147893-12-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>
arch/loongarch/include/asm/pgalloc.h
arch/loongarch/include/asm/pgtable.h

index 93e785f4663973e8f687745e8115cc9fd844fabd..4bfeb3c9c9acc5602e231d6774933423f5076ab9 100644 (file)
@@ -90,7 +90,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_page(GFP_KERNEL);
        if (pud)
                pud_init((unsigned long)pud, (unsigned long)invalid_pmd_table);
        return pud;
index f926537d2233d34ed4b1b7696e2c46adc3bd01fa..a97996fefaed00a7b78a42595972b4c0169c2d5f 100644 (file)
@@ -22,7 +22,6 @@
 #endif
 
 #define PGD_ORDER              0
-#define PUD_ORDER              0
 
 #if CONFIG_PGTABLE_LEVELS == 2
 #define PGDIR_SHIFT    (PAGE_SHIFT + (PAGE_SHIFT - 3))
@@ -38,7 +37,7 @@
 #define PUD_SHIFT      (PMD_SHIFT + (PAGE_SHIFT - 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 - 3))
 #endif
 
 #define PGDIR_SIZE     (1UL << PGDIR_SHIFT)
@@ -48,7 +47,7 @@
 
 #define PTRS_PER_PGD   ((PAGE_SIZE << PGD_ORDER) >> 3)
 #if CONFIG_PGTABLE_LEVELS > 3
-#define PTRS_PER_PUD   ((PAGE_SIZE << PUD_ORDER) >> 3)
+#define PTRS_PER_PUD   (PAGE_SIZE >> 3)
 #endif
 #if CONFIG_PGTABLE_LEVELS > 2
 #define PTRS_PER_PMD   (PAGE_SIZE >> 3)