| Message ID | 20220705154708.181258-8-rppt@kernel.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | arch: make PxD_ORDER generically available | expand |
On 7/5/22 10:47, Mike Rapoport wrote: > From: Mike Rapoport <rppt@linux.ibm.com> > > This is the order of the page table allocation, not the order of a PTE. > Since its always hardwired to 0, simply drop it. > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > --- > arch/nios2/include/asm/pgtable.h | 3 +-- > arch/nios2/mm/init.c | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/nios2/include/asm/pgtable.h b/arch/nios2/include/asm/pgtable.h > index 262d0609268c..eaf8f28baa8b 100644 > --- a/arch/nios2/include/asm/pgtable.h > +++ b/arch/nios2/include/asm/pgtable.h > @@ -69,10 +69,9 @@ struct mm_struct; > #define PAGE_COPY MKP(0, 0, 1) > > #define PGD_ORDER 0 > -#define PTE_ORDER 0 > > #define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t)) > -#define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t)) > +#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t)) > > #define USER_PTRS_PER_PGD \ > (CONFIG_NIOS2_KERNEL_MMU_REGION_BASE / PGDIR_SIZE) > diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c > index 613fcaa5988a..2d6dbf7701f6 100644 > --- a/arch/nios2/mm/init.c > +++ b/arch/nios2/mm/init.c > @@ -80,7 +80,7 @@ void __init mmu_init(void) > > #define __page_aligned(order) __aligned(PAGE_SIZE << (order)) > pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); > -pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER); > +pte_t invalid_pte_table[PTRS_PER_PTE] __aligned(PAGE_SIZE); > static struct page *kuser_page[1]; > > static int alloc_kuser_page(void) Acked-by: Dinh Nguyen <dinguyen@kernel.org>
diff --git a/arch/nios2/include/asm/pgtable.h b/arch/nios2/include/asm/pgtable.h index 262d0609268c..eaf8f28baa8b 100644 --- a/arch/nios2/include/asm/pgtable.h +++ b/arch/nios2/include/asm/pgtable.h @@ -69,10 +69,9 @@ struct mm_struct; #define PAGE_COPY MKP(0, 0, 1) #define PGD_ORDER 0 -#define PTE_ORDER 0 #define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t)) -#define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t)) +#define PTRS_PER_PTE (PAGE_SIZE / sizeof(pte_t)) #define USER_PTRS_PER_PGD \ (CONFIG_NIOS2_KERNEL_MMU_REGION_BASE / PGDIR_SIZE) diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c index 613fcaa5988a..2d6dbf7701f6 100644 --- a/arch/nios2/mm/init.c +++ b/arch/nios2/mm/init.c @@ -80,7 +80,7 @@ void __init mmu_init(void) #define __page_aligned(order) __aligned(PAGE_SIZE << (order)) pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); -pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER); +pte_t invalid_pte_table[PTRS_PER_PTE] __aligned(PAGE_SIZE); static struct page *kuser_page[1]; static int alloc_kuser_page(void)