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

nios2: drop definition of PGD_ORDER 

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

Link: https://lkml.kernel.org/r/20220703141203.147893-9-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
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 bf0dc119

arch/nios2/include/asm/pgtable.h

+1 −3
Original line number Diff line number Diff line
@@ -52,9 +52,7 @@ struct mm_struct; 


#define PAGE_COPY MKP(0, 0, 1)



#define PGD_ORDER	0



#define PTRS_PER_PGD	((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))

#define PTRS_PER_PGD	(PAGE_SIZE / sizeof(pgd_t))

#define PTRS_PER_PTE	(PAGE_SIZE / sizeof(pte_t))



#define USER_PTRS_PER_PGD	\

arch/nios2/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ void __init mmu_init(void) 
	flush_tlb_all();

}



#define __page_aligned(order) __aligned(PAGE_SIZE << (order))

pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);

pgd_t swapper_pg_dir[PTRS_PER_PGD] __aligned(PAGE_SIZE);

pte_t invalid_pte_table[PTRS_PER_PTE] __aligned(PAGE_SIZE);

static struct page *kuser_page[1];

arch/nios2/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 
{

	pgd_t *ret, *init;



	ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_ORDER);

	ret = (pgd_t *) __get_free_page(GFP_KERNEL);

	if (ret) {

		init = pgd_offset(&init_mm, 0UL);

		pgd_init(ret);