From ac0cb87a453698efc6c812e4f27cadbeb208f14e Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Wed, 1 Apr 2026 19:28:54 +0800 Subject: [PATCH] kernel: 6.18: move CONFIG_PAGE_BLOCK_MAX_ORDER to subtargets This symbol depends on the specific CPU type, so we should not set it globally. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/22730 Signed-off-by: Hauke Mehrtens --- target/linux/generic/config-6.18 | 1 - target/linux/microchipsw/lan969x/config-6.18 | 1 + target/linux/mxs/config-6.18 | 1 + target/linux/realtek/rtl838x/config-6.18 | 1 + target/linux/realtek/rtl839x/config-6.18 | 1 + target/linux/realtek/rtl930x_nand/config-6.18 | 1 + target/linux/realtek/rtl931x/config-6.18 | 1 + target/linux/realtek/rtl931x_nand/config-6.18 | 1 + target/linux/x86/config-6.18 | 1 + 9 files changed, 8 insertions(+), 1 deletion(-) diff --git a/target/linux/generic/config-6.18 b/target/linux/generic/config-6.18 index 8ffb985c6a..3a05b7ff03 100644 --- a/target/linux/generic/config-6.18 +++ b/target/linux/generic/config-6.18 @@ -4689,7 +4689,6 @@ CONFIG_OVERLAY_FS_XINO_AUTO=y CONFIG_PACKET=y # CONFIG_PACKET_DIAG is not set # CONFIG_PACKING is not set -CONFIG_PAGE_BLOCK_MAX_ORDER=10 # CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_MAPCOUNT=y # CONFIG_PAGE_OWNER is not set diff --git a/target/linux/microchipsw/lan969x/config-6.18 b/target/linux/microchipsw/lan969x/config-6.18 index 7f8baeeaef..0b2846f1ce 100644 --- a/target/linux/microchipsw/lan969x/config-6.18 +++ b/target/linux/microchipsw/lan969x/config-6.18 @@ -196,6 +196,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y diff --git a/target/linux/mxs/config-6.18 b/target/linux/mxs/config-6.18 index f178dd3ce8..5c6951c5cd 100644 --- a/target/linux/mxs/config-6.18 +++ b/target/linux/mxs/config-6.18 @@ -190,6 +190,7 @@ CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y diff --git a/target/linux/realtek/rtl838x/config-6.18 b/target/linux/realtek/rtl838x/config-6.18 index 1683a494f6..54b1071cf2 100644 --- a/target/linux/realtek/rtl838x/config-6.18 +++ b/target/linux/realtek/rtl838x/config-6.18 @@ -191,6 +191,7 @@ CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y diff --git a/target/linux/realtek/rtl839x/config-6.18 b/target/linux/realtek/rtl839x/config-6.18 index 42019d25e3..c701c8edcb 100644 --- a/target/linux/realtek/rtl839x/config-6.18 +++ b/target/linux/realtek/rtl839x/config-6.18 @@ -200,6 +200,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y diff --git a/target/linux/realtek/rtl930x_nand/config-6.18 b/target/linux/realtek/rtl930x_nand/config-6.18 index 3f8332e230..c9bb82018f 100644 --- a/target/linux/realtek/rtl930x_nand/config-6.18 +++ b/target/linux/realtek/rtl930x_nand/config-6.18 @@ -201,6 +201,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y diff --git a/target/linux/realtek/rtl931x/config-6.18 b/target/linux/realtek/rtl931x/config-6.18 index a78414398c..2855198072 100644 --- a/target/linux/realtek/rtl931x/config-6.18 +++ b/target/linux/realtek/rtl931x/config-6.18 @@ -194,6 +194,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y diff --git a/target/linux/realtek/rtl931x_nand/config-6.18 b/target/linux/realtek/rtl931x_nand/config-6.18 index a7b1961e82..e101f16161 100644 --- a/target/linux/realtek/rtl931x_nand/config-6.18 +++ b/target/linux/realtek/rtl931x_nand/config-6.18 @@ -209,6 +209,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y diff --git a/target/linux/x86/config-6.18 b/target/linux/x86/config-6.18 index 0486c5749a..cf4d194a9f 100644 --- a/target/linux/x86/config-6.18 +++ b/target/linux/x86/config-6.18 @@ -335,6 +335,7 @@ CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y # CONFIG_OLPC is not set CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_PAGE_BLOCK_MAX_ORDER=10 CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y