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 5ECDCC77B75 for ; Tue, 18 Apr 2023 23:33:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbjDRXdv (ORCPT ); Tue, 18 Apr 2023 19:33:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231297AbjDRXdp (ORCPT ); Tue, 18 Apr 2023 19:33:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC40E86A1 for ; Tue, 18 Apr 2023 16:33:42 -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 49D2361528 for ; Tue, 18 Apr 2023 23:33:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1FD7C433EF; Tue, 18 Apr 2023 23:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1681860821; bh=n3yxbxgvY2420lcvCWapo+oV8JKBleXOBNToys0vTmg=; h=Date:To:From:Subject:From; b=SL0zcbJr1N24U9fSLWxBUhSJaPOLWHPkbDR81j/HBCYXe1fWSFZ7dUod+xcXe8gf6 mC01rRWSIlOe0LBRE445aYAWjFf5gBEUdXI304Wba8v3ctC52GZMNoxEGpzoTuzC/3 x8WorGuMjxv0SR8XJ4jlU2oChv0fPQzt9YbWXluA= Date: Tue, 18 Apr 2023 16:33:41 -0700 To: mm-commits@vger.kernel.org, ziy@nvidia.com, ysato@users.sourceforge.jp, will@kernel.org, mpe@ellerman.id.au, linux@armlinux.org.uk, kirill.shutemov@linux.intel.com, jcmvbkbc@gmail.com, guoren@kernel.org, glaubitz@physik.fu-berlin.de, geert@linux-m68k.org, dinguyen@kernel.org, davem@davemloft.net, dalias@libc.org, christophe.leroy@csgroup.eu, catalin.marinas@arm.com, arnd@arndb.de, rppt@kernel.org, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] powerpc-reword-arch_force_max_order-prompt-and-help-text.patch removed from -mm tree Message-Id: <20230418233341.A1FD7C433EF@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: powerpc: reword ARCH_FORCE_MAX_ORDER prompt and help text has been removed from the -mm tree. Its filename was powerpc-reword-arch_force_max_order-prompt-and-help-text.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: "Mike Rapoport (IBM)" Subject: powerpc: reword ARCH_FORCE_MAX_ORDER prompt and help text Date: Fri, 24 Mar 2023 08:22:28 +0300 The prompt and help text of ARCH_FORCE_MAX_ORDER are not even close to describe this configuration option. Update both to actually describe what this option does. Link: https://lkml.kernel.org/r/20230324052233.2654090-10-rppt@kernel.org Signed-off-by: Mike Rapoport (IBM) Acked-by: Kirill A. Shutemov Reviewed-by: Zi Yan Cc: Arnd Bergmann Cc: Catalin Marinas Cc: Christophe Leroy Cc: David Miller Cc: Dinh Nguyen Cc: Geert Uytterhoeven Cc: Guo Ren Cc: John Paul Adrian Glaubitz Cc: Max Filippov Cc: Michael Ellerman Cc: Rich Felker Cc: "Russell King (Oracle)" Cc: Will Deacon Cc: Yoshinori Sato Signed-off-by: Andrew Morton --- arch/powerpc/Kconfig | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) --- a/arch/powerpc/Kconfig~powerpc-reword-arch_force_max_order-prompt-and-help-text +++ a/arch/powerpc/Kconfig @@ -896,7 +896,7 @@ config DATA_SHIFT 8M pages will be pinned. config ARCH_FORCE_MAX_ORDER - int "Maximum zone order" + int "Order of maximal physically contiguous allocations" range 7 8 if PPC64 && PPC_64K_PAGES default "8" if PPC64 && PPC_64K_PAGES range 12 12 if PPC64 && !PPC_64K_PAGES @@ -910,17 +910,19 @@ config ARCH_FORCE_MAX_ORDER range 10 63 default "10" help - The kernel memory allocator divides physically contiguous memory - blocks into "zones", where each zone is a power of two number of - pages. This option selects the largest power of two that the kernel - keeps in the memory allocator. If you need to allocate very large - blocks of physically contiguous memory, then you may need to - increase this value. + The kernel page allocator limits the size of maximal physically + contiguous allocations. The limit is called MAX_ORDER and it + defines the maximal power of two of number of pages that can be + allocated as a single contiguous block. This option allows + overriding the default setting when ability to allocate very + large blocks of physically contiguous memory is required. The page size is not necessarily 4KB. For example, on 64-bit systems, 64KB pages can be enabled via CONFIG_PPC_64K_PAGES. Keep this in mind when choosing a value for this option. + Don't change if unsure. + config PPC_SUBPAGE_PROT bool "Support setting protections for 4k subpages (subpage_prot syscall)" default n _ Patches currently in -mm which might be from rppt@kernel.org are powerpc-drop-ranges-for-definition-of-arch_force_max_order.patch sh-reword-arch_force_max_order-prompt-and-help-text.patch sh-drop-ranges-for-definition-of-arch_force_max_order.patch sparc-reword-arch_force_max_order-prompt-and-help-text.patch xtensa-reword-arch_force_max_order-prompt-and-help-text.patch mm-move-free_area_empty-to-mm-internalh.patch