From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25431CCA480 for ; Mon, 11 Jul 2022 22:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230503AbiGKWzV (ORCPT ); Mon, 11 Jul 2022 18:55:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbiGKWzT (ORCPT ); Mon, 11 Jul 2022 18:55:19 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6060277A69; Mon, 11 Jul 2022 15:55:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CE828B81601; Mon, 11 Jul 2022 22:55:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E0F7C34115; Mon, 11 Jul 2022 22:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657580114; bh=14pnKIJT4xGcd7MxjhIRhm94fsD1jimb9rOIpABahqo=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=j3qpaHz6AIkJFBeD2OgRxoT8189q2v4Ect7vzDMo7mlAYKpjBl1wQdj9e2Q3FU8we 01bt32X5/15z3SCQN8lLH1c4XaX1sdOeJyq1LkMjmZt4RC6cLZr/fMX5KI8znDehbA EpIRiPXw89kkJ+71ZugqXyOsjZaLQmg0NzB3DsQpnATtWCAwxLHEu2Ndyc1xNTnPyr yo4bGdzCuVFqqCN4XE45SgU7Ng33B8iW254Om2wUAp1PUejZZcTTYkjE2T5JEVkjbh gLhjoBu+ao52ASgUa2qXUDnWikLQMyg5VryICGW/S46SAjD20gdBZ/TMap8bWVlkSA GUfoY0G/YZxVw== Message-ID: Date: Mon, 11 Jul 2022 17:55:09 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH v2 07/15] nios2: drop definition of PTE_ORDER Content-Language: en-US To: Mike Rapoport , Andrew Morton Cc: Arnd Bergmann , Guo Ren , Helge Deller , Huacai Chen , "James E.J. Bottomley" , Matthew Wilcox , Max Filippov , Mike Rapoport , "Russell King (Oracle)" , Thomas Bogendoerfer , WANG Xuerui , linux-arch@vger.kernel.org, linux-csky@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-xtensa@linux-xtensa.org, loongarch@lists.linux.dev References: <20220705154708.181258-1-rppt@kernel.org> <20220705154708.181258-8-rppt@kernel.org> From: Dinh Nguyen In-Reply-To: <20220705154708.181258-8-rppt@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org On 7/5/22 10:47, Mike Rapoport wrote: > From: Mike Rapoport > > 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 > --- > 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