[openwrt/openwrt] kernel: migrate FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER for 6.1

LEDE Commits lede-commits at lists.infradead.org
Sun Jun 25 02:27:42 PDT 2023 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b308bd50efaadd2fdfa58123b0e25896478c882b

commit b308bd50efaadd2fdfa58123b0e25896478c882b
Author: Stefan Kalscheuer <stefan at stklcode.de>
AuthorDate: Mon Jun 19 08:24:31 2023 +0200

    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 at stklcode.de>
---
 target/linux/apm821xx/config-6.1        | 1 -
 target/linux/armsr/config-6.1           | 1 -
 target/linux/bcm27xx/bcm2708/config-6.1 | 1 -
 target/linux/bcm27xx/bcm2709/config-6.1 | 1 -
 target/linux/bcm27xx/bcm2710/config-6.1 | 1 -
 target/linux/bcm27xx/bcm2711/config-6.1 | 1 -
 target/linux/bmips/bcm6318/config-6.1   | 1 -
 target/linux/bmips/bcm63268/config-6.1  | 1 -
 target/linux/bmips/bcm6328/config-6.1   | 1 -
 target/linux/bmips/bcm6358/config-6.1   | 1 -
 target/linux/bmips/bcm6362/config-6.1   | 1 -
 target/linux/bmips/bcm6368/config-6.1   | 1 -
 target/linux/gemini/config-6.1          | 1 -
 target/linux/generic/config-6.1         | 2 +-
 target/linux/ipq806x/config-6.1         | 1 -
 target/linux/malta/config-6.1           | 1 -
 target/linux/qualcommax/config-6.1      | 1 -
 target/linux/rockchip/armv8/config-6.1  | 1 -
 18 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/target/linux/apm821xx/config-6.1 b/target/linux/apm821xx/config-6.1
index 9e51e94a2f..2979312101 100644
--- 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 a48af89b87..46483152d0 100644
--- 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 edf74c4fad..e1942be1f9 100644
--- 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 4f9be6d371..0e5824011c 100644
--- 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 295b665589..0782618e7c 100644
--- 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 6642a88142..eea6beac3d 100644
--- 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 4f54ce5533..526319da33 100644
--- 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 2ed4eba2f6..624c00556d 100644
--- 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 85d5578b8e..5b33e93236 100644
--- 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 1d95a92cbc..8ca1ca3af5 100644
--- 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 b51f7e4166..dba808dfb2 100644
--- 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 6fd4fe03bb..13915425d8 100644
--- 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 41f7093c1c..a4f2cba851 100644
--- 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 6252e66896..956738afe8 100644
--- 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 559de1cf48..b30a635396 100644
--- 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 9411879835..8ab648069d 100644
--- 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 2fa4aa30bb..ec44e936b4 100644
--- 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 4d747537e2..e21de9a348 100644
--- 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

More information about the lede-commits mailing list