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>

diff --git a/target/linux/apm821xx/config-6.1 b/target/linux/apm821xx/config-6.1
index 9e51e94a2f5c1e6fc745f24fcfa8b53e129ae645..2979312101b602c3e82d43eb528e3467d5c52fed 100644 (file)
--- 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
index a48af89b875b474cb893fb501d8a184061b16c78..46483152d034beb6dcdea8b83c7a651e520fa9a2 100644 (file)
--- 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
index edf74c4fad8f643ce020a5c2412c37bc21f1ce2c..e1942be1f9486a11d73eb6a53d9d67fe6cf4c11a 100644 (file)
--- 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
index 4f9be6d37164ae088e5003b7ca1fe2fac64e5bc9..0e5824011c61146722199448a5651428eec114ba 100644 (file)
--- 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
index 295b6655895ec7ebbea9e5bbb7baf0b58e73ae75..0782618e7c2cc809d9c4b57ac1c6d2c82668efae 100644 (file)
--- 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
index 6642a88142d1d5bb15785d278f65585caca2e462..eea6beac3d4831b659db8e332f377ada12e89ccf 100644 (file)
--- 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
index 4f54ce553391da050f7e70ca211d5afdea610b62..526319da33d8f014b3775569f26eb45b7882df95 100644 (file)
--- 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
index 2ed4eba2f6e11d5abd073af5717add7285c855bb..624c00556db9a1b3a558f727c560c5746dfbdf98 100644 (file)
--- 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
index 85d5578b8eb956d63bccf4ad464cc4a765e29e8d..5b33e932360fec3f4ef69639f5e3ee0214b0e0d3 100644 (file)
--- 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
index 1d95a92cbc322b10ea64347a698c3f0933ddb7bb..8ca1ca3af54aebe2e40a09b52a77a68774ff2a8f 100644 (file)
--- 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
index b51f7e4166aadb08873b1ed4fcdb35186019a697..dba808dfb232d9f3d454a507b99f51eef31782ee 100644 (file)
--- 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
index 6fd4fe03bbe12b44c0ba4a9f80e878c1d199f839..13915425d8577137dec3392f9d27039ce7c7d4f1 100644 (file)
--- 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
index 41f7093c1cef1aa8039650b5712f1762b8e9de9c..a4f2cba851244140eb0c0d7cc1c690db486ee5a2 100644 (file)
--- 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
index 6252e6689651176279976ec9c641816bbc131300..956738afe8e84583249c5daced087a7a5aef30fb 100644 (file)
--- 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
index 559de1cf48a1f35741077599f24b3de11528a413..b30a6353967b39c0389b0729220dbb4113ec7560 100644 (file)
--- 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
index 9411879835b39402bb6d8834ea0bba8a49ea9ca4..8ab648069d2d87879d2e1561d0114f1bdc61ef84 100644 (file)
--- 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
index 2fa4aa30bbfcb1e7173c8fe19b728ea2e256f4d4..ec44e936b44115062a75042f9cefcbfbbd2e17ef 100644 (file)
--- 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
index 4d747537e238c58f57711b3be58bc38ea98090ab..e21de9a348492f2e3ef6f2379a06abc97c1643a2 100644 (file)
--- 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