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

loongarch: drop definition of PMD_ORDER 

This is the order of the page table allocation, not the order of a PMD. 
Since its always hardwired to 0, simply drop it.

Link: https://lkml.kernel.org/r/20220703141203.147893-11-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 1721b412

arch/loongarch/include/asm/pgalloc.h

+2 −2
Original line number Diff line number Diff line
@@ -66,12 +66,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_page(GFP_KERNEL_ACCOUNT);

	if (!pg)

		return NULL;



	if (!pgtable_pmd_page_ctor(pg)) {

		__free_pages(pg, PMD_ORDER);

		__free_page(pg);

		return NULL;

	}

arch/loongarch/include/asm/pgtable.h

+3 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#define PGD_ORDER		0

#define PUD_ORDER		0

#define PMD_ORDER		0



#if CONFIG_PGTABLE_LEVELS == 2

#define PGDIR_SHIFT	(PAGE_SHIFT + (PAGE_SHIFT - 3))
@@ -31,12 +30,12 @@ 
#define PMD_SHIFT	(PAGE_SHIFT + (PAGE_SHIFT - 3))

#define PMD_SIZE	(1UL << PMD_SHIFT)

#define PMD_MASK	(~(PMD_SIZE-1))

#define PGDIR_SHIFT	(PMD_SHIFT + (PAGE_SHIFT + PMD_ORDER - 3))

#define PGDIR_SHIFT	(PMD_SHIFT + (PAGE_SHIFT - 3))

#elif CONFIG_PGTABLE_LEVELS == 4

#define PMD_SHIFT	(PAGE_SHIFT + (PAGE_SHIFT - 3))

#define PMD_SIZE	(1UL << PMD_SHIFT)

#define PMD_MASK	(~(PMD_SIZE-1))

#define PUD_SHIFT	(PMD_SHIFT + (PAGE_SHIFT + PMD_ORDER - 3))

#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))
@@ -52,7 +51,7 @@ 
#define PTRS_PER_PUD	((PAGE_SIZE << PUD_ORDER) >> 3)

#endif

#if CONFIG_PGTABLE_LEVELS > 2

#define PTRS_PER_PMD	((PAGE_SIZE << PMD_ORDER) >> 3)

#define PTRS_PER_PMD	(PAGE_SIZE >> 3)

#endif

#define PTRS_PER_PTE	(PAGE_SIZE >> 3)

arch/loongarch/kernel/asm-offsets.c

+0 −3
Original line number Diff line number Diff line
@@ -191,9 +191,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

	BLANK();

	DEFINE(_PMD_SHIFT, PMD_SHIFT);

	DEFINE(_PGDIR_SHIFT, PGDIR_SHIFT);