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 42812CCA480 for ; Sun, 3 Jul 2022 20:28:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232176AbiGCU2f (ORCPT ); Sun, 3 Jul 2022 16:28:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232452AbiGCU2c (ORCPT ); Sun, 3 Jul 2022 16:28:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4130D1129 for ; Sun, 3 Jul 2022 13:28:31 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D2672611B7 for ; Sun, 3 Jul 2022 20:28:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DB4DC341C6; Sun, 3 Jul 2022 20:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1656880110; bh=II9ZqhrQKBjeTWFg86VCpPNAHh2bTLkjuTv6GJ/ab9o=; h=Date:To:From:Subject:From; b=ATkjz8aw/3WZX9e4Clv5F/YzVL4GsH0qEiLAKV7vtWWlcF1+3OzK8KOH/b/t+u6sR dkfQ0fpPzvTg8oVzCnJu9gDew4iaync8koFhuHjCFy6l0kGp88Sb0Cd0bfbrpEf3WI VdgAQ6sMvUwlbrfl5g/ekiUevsogOFqTZR9D3HLM= Date: Sun, 03 Jul 2022 13:28:29 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, tsbogend@alpha.franken.de, kernel@xen0n.name, jcmvbkbc@gmail.com, James.Bottomley@HansenPartnership.com, guoren@kernel.org, dinguyen@kernel.org, deller@gmx.de, chenhuacai@kernel.org, arnd@arndb.de, rppt@linux.ibm.com, akpm@linux-foundation.org From: Andrew Morton Subject: + loongarch-drop-definition-of-pud_order.patch added to mm-unstable branch Message-Id: <20220703202830.2DB4DC341C6@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: loongarch: drop definition of PUD_ORDER has been added to the -mm mm-unstable branch. Its filename is loongarch-drop-definition-of-pud_order.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/loongarch-drop-definition-of-pud_order.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Mike Rapoport Subject: loongarch: drop definition of PUD_ORDER Date: Sun, 3 Jul 2022 17:12:00 +0300 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 Cc: Arnd Bergmann Cc: Dinh Nguyen Cc: Guo Ren Cc: Helge Deller Cc: Huacai Chen Cc: James Bottomley Cc: "Matthew Wilcox (Oracle)" Cc: Max Filippov Cc: Thomas Bogendoerfer Cc: Xuerui Wang Signed-off-by: Andrew Morton --- arch/loongarch/include/asm/pgalloc.h | 2 +- arch/loongarch/include/asm/pgtable.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) --- a/arch/loongarch/include/asm/pgalloc.h~loongarch-drop-definition-of-pud_order +++ a/arch/loongarch/include/asm/pgalloc.h @@ -90,7 +90,7 @@ static inline pud_t *pud_alloc_one(struc { 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; --- a/arch/loongarch/include/asm/pgtable.h~loongarch-drop-definition-of-pud_order +++ a/arch/loongarch/include/asm/pgtable.h @@ -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) _ Patches currently in -mm which might be from rppt@linux.ibm.com are csky-drop-definition-of-pte_order.patch csky-drop-definition-of-pgd_order.patch mips-rename-pud_order-to-pud_table_order.patch mips-drop-definitions-of-pte_order.patch mips-rename-pgd_order-to-pgd_table_order.patch nios2-drop-definition-of-pte_order.patch nios2-drop-definition-of-pgd_order.patch loongarch-drop-definition-of-pte_order.patch loongarch-drop-definition-of-pmd_order.patch loongarch-drop-definition-of-pud_order.patch loongarch-drop-definition-of-pgd_order.patch parisc-rename-pgd_order-to-pgd_table_order.patch xtensa-drop-definition-of-pgd_order.patch