tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

arch: mm: rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER

This Kconfig option is used by individual arch to set its desired
MAX_ORDER. Rename it to reflect its actual use.

Link: https://lkml.kernel.org/r/20220815143959.1511278-1-zi.yan@sent.com
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Zi Yan <ziy@nvidia.com>
Acked-by: Guo Ren <guoren@kernel.org> [csky]
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Catalin Marinas <catalin.marinas@arm.com> [arm64]
Acked-by: Huacai Chen <chenhuacai@kernel.org> [LoongArch]
Acked-by: Michael Ellerman <mpe@ellerman.id.au> [powerpc]
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Taichi Sugaya <sugaya.taichi@socionext.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Qin Jian <qinjian@cqplus1.com>
Cc: Guo Ren <guoren@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Zankel <chris@zankel.net>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Zi Yan and committed by
Andrew Morton 0192445c 46e87152

+27 -27
+1 -1
arch/arc/Kconfig
··· 554 554 555 555 endmenu # "ARC Architecture Configuration" 556 556 557 - config FORCE_MAX_ZONEORDER 557 + config ARCH_FORCE_MAX_ORDER 558 558 int "Maximum zone order" 559 559 default "12" if ARC_HUGEPAGE_16M 560 560 default "11"
+1 -1
arch/arm/Kconfig
··· 1434 1434 Disabling this is usually safe for small single-platform 1435 1435 configurations. If unsure, say y. 1436 1436 1437 - config FORCE_MAX_ZONEORDER 1437 + config ARCH_FORCE_MAX_ORDER 1438 1438 int "Maximum zone order" 1439 1439 default "12" if SOC_AM33XX 1440 1440 default "9" if SA1111
+1 -1
arch/arm/configs/imx_v6_v7_defconfig
··· 31 31 CONFIG_SMP=y 32 32 CONFIG_ARM_PSCI=y 33 33 CONFIG_HIGHMEM=y 34 - CONFIG_FORCE_MAX_ZONEORDER=14 34 + CONFIG_ARCH_FORCE_MAX_ORDER=14 35 35 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" 36 36 CONFIG_KEXEC=y 37 37 CONFIG_CPU_FREQ=y
+1 -1
arch/arm/configs/milbeaut_m10v_defconfig
··· 26 26 # CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 is not set 27 27 # CONFIG_ARM_PATCH_IDIV is not set 28 28 CONFIG_HIGHMEM=y 29 - CONFIG_FORCE_MAX_ZONEORDER=12 29 + CONFIG_ARCH_FORCE_MAX_ORDER=12 30 30 CONFIG_SECCOMP=y 31 31 CONFIG_KEXEC=y 32 32 CONFIG_EFI=y
+1 -1
arch/arm/configs/oxnas_v6_defconfig
··· 12 12 CONFIG_MACH_OX820=y 13 13 CONFIG_SMP=y 14 14 CONFIG_NR_CPUS=16 15 - CONFIG_FORCE_MAX_ZONEORDER=12 15 + CONFIG_ARCH_FORCE_MAX_ORDER=12 16 16 CONFIG_SECCOMP=y 17 17 CONFIG_ARM_APPENDED_DTB=y 18 18 CONFIG_ARM_ATAG_DTB_COMPAT=y
+1 -1
arch/arm/configs/pxa_defconfig
··· 21 21 CONFIG_MACH_BORZOI=y 22 22 CONFIG_PXA_SYSTEMS_CPLDS=y 23 23 CONFIG_AEABI=y 24 - CONFIG_FORCE_MAX_ZONEORDER=9 24 + CONFIG_ARCH_FORCE_MAX_ORDER=9 25 25 CONFIG_CMDLINE="root=/dev/ram0 ro" 26 26 CONFIG_KEXEC=y 27 27 CONFIG_CPU_FREQ=y
+1 -1
arch/arm/configs/sama7_defconfig
··· 19 19 # CONFIG_CACHE_L2X0 is not set 20 20 # CONFIG_ARM_PATCH_IDIV is not set 21 21 # CONFIG_CPU_SW_DOMAIN_PAN is not set 22 - CONFIG_FORCE_MAX_ZONEORDER=15 22 + CONFIG_ARCH_FORCE_MAX_ORDER=15 23 23 CONFIG_UACCESS_WITH_MEMCPY=y 24 24 # CONFIG_ATAGS is not set 25 25 CONFIG_CMDLINE="console=ttyS0,115200 earlyprintk ignore_loglevel"
+1 -1
arch/arm/configs/sp7021_defconfig
··· 18 18 # CONFIG_VDSO is not set 19 19 CONFIG_SMP=y 20 20 CONFIG_THUMB2_KERNEL=y 21 - CONFIG_FORCE_MAX_ZONEORDER=12 21 + CONFIG_ARCH_FORCE_MAX_ORDER=12 22 22 CONFIG_VFP=y 23 23 CONFIG_NEON=y 24 24 CONFIG_MODULES=y
+1 -1
arch/arm64/Kconfig
··· 1418 1418 help 1419 1419 Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64. 1420 1420 1421 - config FORCE_MAX_ZONEORDER 1421 + config ARCH_FORCE_MAX_ORDER 1422 1422 int 1423 1423 default "14" if ARM64_64K_PAGES 1424 1424 default "12" if ARM64_16K_PAGES
+1 -1
arch/csky/Kconfig
··· 332 332 select KMAP_LOCAL 333 333 default y 334 334 335 - config FORCE_MAX_ZONEORDER 335 + config ARCH_FORCE_MAX_ORDER 336 336 int "Maximum zone order" 337 337 default "11" 338 338
+1 -1
arch/ia64/Kconfig
··· 200 200 Say Y here to enable support for IBM EXA Cyclone time source. 201 201 If you're unsure, answer N. 202 202 203 - config FORCE_MAX_ZONEORDER 203 + config ARCH_FORCE_MAX_ORDER 204 204 int "MAX_ORDER (11 - 17)" if !HUGETLB_PAGE 205 205 range 11 17 if !HUGETLB_PAGE 206 206 default "17" if HUGETLB_PAGE
+3 -3
arch/ia64/include/asm/sparsemem.h
··· 11 11 12 12 #define SECTION_SIZE_BITS (30) 13 13 #define MAX_PHYSMEM_BITS (50) 14 - #ifdef CONFIG_FORCE_MAX_ZONEORDER 15 - #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) 14 + #ifdef CONFIG_ARCH_FORCE_MAX_ORDER 15 + #if ((CONFIG_ARCH_FORCE_MAX_ORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) 16 16 #undef SECTION_SIZE_BITS 17 - #define SECTION_SIZE_BITS (CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) 17 + #define SECTION_SIZE_BITS (CONFIG_ARCH_FORCE_MAX_ORDER - 1 + PAGE_SHIFT) 18 18 #endif 19 19 #endif 20 20
+1 -1
arch/loongarch/Kconfig
··· 370 370 default "6" 371 371 depends on NUMA 372 372 373 - config FORCE_MAX_ZONEORDER 373 + config ARCH_FORCE_MAX_ORDER 374 374 int "Maximum zone order" 375 375 range 14 64 if PAGE_SIZE_64KB 376 376 default "14" if PAGE_SIZE_64KB
+1 -1
arch/m68k/Kconfig.cpu
··· 399 399 order" to save memory that could be wasted for unused memory map. 400 400 Say N if not sure. 401 401 402 - config FORCE_MAX_ZONEORDER 402 + config ARCH_FORCE_MAX_ORDER 403 403 int "Maximum zone order" if ADVANCED 404 404 depends on !SINGLE_MEMORY_CHUNK 405 405 default "11"
+1 -1
arch/mips/Kconfig
··· 2140 2140 2141 2141 endchoice 2142 2142 2143 - config FORCE_MAX_ZONEORDER 2143 + config ARCH_FORCE_MAX_ORDER 2144 2144 int "Maximum zone order" 2145 2145 range 14 64 if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_64KB 2146 2146 default "14" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_64KB
+1 -1
arch/nios2/Kconfig
··· 44 44 45 45 source "kernel/Kconfig.hz" 46 46 47 - config FORCE_MAX_ZONEORDER 47 + config ARCH_FORCE_MAX_ORDER 48 48 int "Maximum zone order" 49 49 range 9 20 50 50 default "11"
+1 -1
arch/powerpc/Kconfig
··· 845 845 in that case. If PIN_TLB is selected, it must be aligned to 8M as 846 846 8M pages will be pinned. 847 847 848 - config FORCE_MAX_ZONEORDER 848 + config ARCH_FORCE_MAX_ORDER 849 849 int "Maximum zone order" 850 850 range 8 9 if PPC64 && PPC_64K_PAGES 851 851 default "9" if PPC64 && PPC_64K_PAGES
+1 -1
arch/powerpc/configs/85xx/ge_imp3a_defconfig
··· 30 30 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 31 31 CONFIG_BINFMT_MISC=m 32 32 CONFIG_MATH_EMULATION=y 33 - CONFIG_FORCE_MAX_ZONEORDER=17 33 + CONFIG_ARCH_FORCE_MAX_ORDER=17 34 34 CONFIG_PCI=y 35 35 CONFIG_PCIEPORTBUS=y 36 36 CONFIG_PCI_MSI=y
+1 -1
arch/powerpc/configs/fsl-emb-nonhw.config
··· 41 41 CONFIG_FONT_8x16=y 42 42 CONFIG_FONT_8x8=y 43 43 CONFIG_FONTS=y 44 - CONFIG_FORCE_MAX_ZONEORDER=13 44 + CONFIG_ARCH_FORCE_MAX_ORDER=13 45 45 CONFIG_FRAMEBUFFER_CONSOLE=y 46 46 CONFIG_FRAME_WARN=1024 47 47 CONFIG_FTL=y
+1 -1
arch/sh/configs/ecovec24_defconfig
··· 8 8 CONFIG_MODULE_UNLOAD=y 9 9 # CONFIG_BLK_DEV_BSG is not set 10 10 CONFIG_CPU_SUBTYPE_SH7724=y 11 - CONFIG_FORCE_MAX_ZONEORDER=12 11 + CONFIG_ARCH_FORCE_MAX_ORDER=12 12 12 CONFIG_MEMORY_SIZE=0x10000000 13 13 CONFIG_FLATMEM_MANUAL=y 14 14 CONFIG_SH_ECOVEC=y
+1 -1
arch/sh/mm/Kconfig
··· 18 18 default "0x80000000" if MMU 19 19 default "0x00000000" 20 20 21 - config FORCE_MAX_ZONEORDER 21 + config ARCH_FORCE_MAX_ORDER 22 22 int "Maximum zone order" 23 23 range 9 64 if PAGE_SIZE_16KB 24 24 default "9" if PAGE_SIZE_16KB
+1 -1
arch/sparc/Kconfig
··· 269 269 config ARCH_SPARSEMEM_DEFAULT 270 270 def_bool y if SPARC64 271 271 272 - config FORCE_MAX_ZONEORDER 272 + config ARCH_FORCE_MAX_ORDER 273 273 int "Maximum zone order" 274 274 default "13" 275 275 help
+1 -1
arch/xtensa/Kconfig
··· 771 771 772 772 If unsure, say Y. 773 773 774 - config FORCE_MAX_ZONEORDER 774 + config ARCH_FORCE_MAX_ORDER 775 775 int "Maximum zone order" 776 776 default "11" 777 777 help
+2 -2
include/linux/mmzone.h
··· 24 24 #include <asm/page.h> 25 25 26 26 /* Free memory management - zoned buddy allocator. */ 27 - #ifndef CONFIG_FORCE_MAX_ZONEORDER 27 + #ifndef CONFIG_ARCH_FORCE_MAX_ORDER 28 28 #define MAX_ORDER 11 29 29 #else 30 - #define MAX_ORDER CONFIG_FORCE_MAX_ZONEORDER 30 + #define MAX_ORDER CONFIG_ARCH_FORCE_MAX_ORDER 31 31 #endif 32 32 #define MAX_ORDER_NR_PAGES (1 << (MAX_ORDER - 1)) 33 33