kernel: migrate FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER for 6.1

The flag FORCE_MAX_ZONEORDER was renamed to ARCH_FORCE_MAX_ORDER in Kernel 6.1 [1]. Rename the flag in generic Kconfig and remove it from target configs. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0192445cb2f7ed1cd7a95a0fc8c7645480baba25 Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
frappefries · Jun 25, 2023 · b308bd5 · b308bd5
1 parent f1136fe
commit b308bd5
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 18 deletions.
diff --git a/target/linux/apm821xx/config-6.1 b/target/linux/apm821xx/config-6.1
@@ -10,7 +10,6 @@ CONFIG_APM821xx=y
 # CONFIG_ARCHES is not set
 CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y

diff --git a/target/linux/armsr/config-6.1 b/target/linux/armsr/config-6.1
@@ -39,7 +39,6 @@ CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_TINY_POWER_BUTTON is not set
 # CONFIG_ALIBABA_UNCORE_DRW_PMU is not set
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

diff --git a/target/linux/bcm27xx/bcm2708/config-6.1 b/target/linux/bcm27xx/bcm2708/config-6.1
@@ -4,7 +4,6 @@ CONFIG_APERTURE_HELPERS=y
 CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y

diff --git a/target/linux/bcm27xx/bcm2709/config-6.1 b/target/linux/bcm27xx/bcm2709/config-6.1
@@ -5,7 +5,6 @@ CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y

diff --git a/target/linux/bcm27xx/bcm2710/config-6.1 b/target/linux/bcm27xx/bcm2710/config-6.1
@@ -6,7 +6,6 @@ CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
 CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

diff --git a/target/linux/bcm27xx/bcm2711/config-6.1 b/target/linux/bcm27xx/bcm2711/config-6.1
@@ -6,7 +6,6 @@ CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
 CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

diff --git a/target/linux/bmips/bcm6318/config-6.1 b/target/linux/bmips/bcm6318/config-6.1
@@ -1,5 +1,4 @@
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MMAP_RND_BITS_MAX=15

diff --git a/target/linux/bmips/bcm63268/config-6.1 b/target/linux/bmips/bcm63268/config-6.1
@@ -1,5 +1,4 @@
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MMAP_RND_BITS_MAX=15

diff --git a/target/linux/bmips/bcm6328/config-6.1 b/target/linux/bmips/bcm6328/config-6.1
@@ -1,5 +1,4 @@
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MMAP_RND_BITS_MAX=15

diff --git a/target/linux/bmips/bcm6358/config-6.1 b/target/linux/bmips/bcm6358/config-6.1
@@ -1,5 +1,4 @@
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MMAP_RND_BITS_MAX=15

diff --git a/target/linux/bmips/bcm6362/config-6.1 b/target/linux/bmips/bcm6362/config-6.1
@@ -1,5 +1,4 @@
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MMAP_RND_BITS_MAX=15

diff --git a/target/linux/bmips/bcm6368/config-6.1 b/target/linux/bmips/bcm6368/config-6.1
@@ -1,5 +1,4 @@
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MMAP_RND_BITS_MAX=15

diff --git a/target/linux/gemini/config-6.1 b/target/linux/gemini/config-6.1
@@ -1,7 +1,6 @@
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_AMBA_PL08X=y
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_GEMINI=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y

diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1
@@ -239,6 +239,7 @@ CONFIG_ARCH_BINFMT_ELF_STATE=y
 # CONFIG_ARCH_EXYNOS is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_FOOTBRIDGE is not set
+CONFIG_ARCH_FORCE_MAX_ORDER=11
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_HI3xxx is not set
 # CONFIG_ARCH_HIGHBANK is not set
@@ -2160,7 +2161,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FONT_6x8 is not set
 # CONFIG_FONT_TER16x32 is not set
 # CONFIG_FORCEDETH is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FORCE_NR_CPUS is not set
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA is not set

diff --git a/target/linux/ipq806x/config-6.1 b/target/linux/ipq806x/config-6.1
@@ -3,7 +3,6 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_APQ_MMCC_8084 is not set
 CONFIG_AR8216_PHY=y
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # CONFIG_ARCH_IPQ40XX is not set
 CONFIG_ARCH_IPQ806X=y

diff --git a/target/linux/malta/config-6.1 b/target/linux/malta/config-6.1
@@ -1,5 +1,4 @@
 CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y

diff --git a/target/linux/qualcommax/config-6.1 b/target/linux/qualcommax/config-6.1
@@ -4,7 +4,6 @@ CONFIG_64BIT=y
 CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
 CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y

diff --git a/target/linux/rockchip/armv8/config-6.1 b/target/linux/rockchip/armv8/config-6.1
@@ -2,7 +2,6 @@ CONFIG_64BIT=y
 CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
 CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y