From 9bca272330bc5d9baf23a7ec4b3086e9026d9bb2 Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Mon, 11 May 2026 08:44:41 +0200 Subject: [PATCH] kernel: sync target configs after JUMP_LABEL changes CONFIG_JUMP_LABEL is no longer meant to be set explicitly in target kernel configs after 3be02c118f0d ("kernel: enable static key"). Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/23293 Signed-off-by: Robert Marko --- target/linux/layerscape/armv8_64b/config-6.12 | 1 - target/linux/loongarch64/config-6.12 | 1 - target/linux/mediatek/filogic/config-6.18 | 1 - target/linux/mediatek/mt7622/config-6.18 | 1 - target/linux/microchipsw/lan969x/config-6.18 | 1 - target/linux/qoriq/config-6.12 | 3 --- target/linux/rockchip/armv8/config-6.12 | 1 - target/linux/rockchip/armv8/config-6.18 | 1 - target/linux/siflower/sf21/config-6.12 | 1 - target/linux/starfive/config-6.12 | 1 - target/linux/starfive/config-6.18 | 1 - 11 files changed, 13 deletions(-) diff --git a/target/linux/layerscape/armv8_64b/config-6.12 b/target/linux/layerscape/armv8_64b/config-6.12 index 7e2366aaa7..f9f1a777a7 100644 --- a/target/linux/layerscape/armv8_64b/config-6.12 +++ b/target/linux/layerscape/armv8_64b/config-6.12 @@ -433,7 +433,6 @@ CONFIG_IRQ_MSI_LIB=y CONFIG_IRQ_WORK=y # CONFIG_ISDN is not set CONFIG_JBD2=y -CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KCMP=y diff --git a/target/linux/loongarch64/config-6.12 b/target/linux/loongarch64/config-6.12 index f0a36e65ef..76a9ecb27e 100644 --- a/target/linux/loongarch64/config-6.12 +++ b/target/linux/loongarch64/config-6.12 @@ -376,7 +376,6 @@ CONFIG_IRQ_WORK=y # CONFIG_ISCSI_IBFT is not set CONFIG_ISO9660_FS=y CONFIG_JBD2=y -CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS=y CONFIG_KCMP=y CONFIG_KERNEL_GZIP=y diff --git a/target/linux/mediatek/filogic/config-6.18 b/target/linux/mediatek/filogic/config-6.18 index 96dd35a64d..30f1496c74 100644 --- a/target/linux/mediatek/filogic/config-6.18 +++ b/target/linux/mediatek/filogic/config-6.18 @@ -247,7 +247,6 @@ CONFIG_IRQ_MSI_LIB=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -CONFIG_JUMP_LABEL=y CONFIG_LEDS_PWM=y CONFIG_LEDS_SMARTRG_LED=y CONFIG_LEDS_TRIGGER_PATTERN=y diff --git a/target/linux/mediatek/mt7622/config-6.18 b/target/linux/mediatek/mt7622/config-6.18 index 87dd01f388..d19a0121ce 100644 --- a/target/linux/mediatek/mt7622/config-6.18 +++ b/target/linux/mediatek/mt7622/config-6.18 @@ -240,7 +240,6 @@ CONFIG_IRQ_MSI_LIB=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -CONFIG_JUMP_LABEL=y CONFIG_LEDS_SMARTRG_LED=y CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y diff --git a/target/linux/microchipsw/lan969x/config-6.18 b/target/linux/microchipsw/lan969x/config-6.18 index a0bbaf3fc7..4b79ae36f3 100644 --- a/target/linux/microchipsw/lan969x/config-6.18 +++ b/target/linux/microchipsw/lan969x/config-6.18 @@ -149,7 +149,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_MSI_IOMMU=y CONFIG_IRQ_MSI_LIB=y CONFIG_IRQ_WORK=y -CONFIG_JUMP_LABEL=y CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y diff --git a/target/linux/qoriq/config-6.12 b/target/linux/qoriq/config-6.12 index bc1d32a40f..edd528698b 100644 --- a/target/linux/qoriq/config-6.12 +++ b/target/linux/qoriq/config-6.12 @@ -207,9 +207,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_ISA_DMA_API=y CONFIG_JBD2=y -CONFIG_JUMP_LABEL=y -CONFIG_JUMP_LABEL_FEATURE_CHECKS=y -# CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG is not set CONFIG_KALLSYMS=y CONFIG_KERNEL_GZIP=y CONFIG_KERNEL_START=0xc000000000000000 diff --git a/target/linux/rockchip/armv8/config-6.12 b/target/linux/rockchip/armv8/config-6.12 index f4a151dafb..a5f2ac709f 100644 --- a/target/linux/rockchip/armv8/config-6.12 +++ b/target/linux/rockchip/armv8/config-6.12 @@ -356,7 +356,6 @@ CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y CONFIG_JFFS2_ZLIB=y -CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS=y CONFIG_KCMP=y CONFIG_KEXEC_CORE=y diff --git a/target/linux/rockchip/armv8/config-6.18 b/target/linux/rockchip/armv8/config-6.18 index 892df0a512..0ce36169cb 100644 --- a/target/linux/rockchip/armv8/config-6.18 +++ b/target/linux/rockchip/armv8/config-6.18 @@ -363,7 +363,6 @@ CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y CONFIG_JFFS2_ZLIB=y -CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS=y CONFIG_KCMP=y CONFIG_KEXEC_CORE=y diff --git a/target/linux/siflower/sf21/config-6.12 b/target/linux/siflower/sf21/config-6.12 index 372a5888f3..624279f5ab 100644 --- a/target/linux/siflower/sf21/config-6.12 +++ b/target/linux/siflower/sf21/config-6.12 @@ -127,7 +127,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_STACKS=y CONFIG_IRQ_WORK=y -CONFIG_JUMP_LABEL=y CONFIG_KCMP=y # CONFIG_KERNEL_UNCOMPRESSED is not set CONFIG_LED_TRIGGER_PHY=y diff --git a/target/linux/starfive/config-6.12 b/target/linux/starfive/config-6.12 index d4b7606696..4faa01e46f 100644 --- a/target/linux/starfive/config-6.12 +++ b/target/linux/starfive/config-6.12 @@ -274,7 +274,6 @@ CONFIG_IRQ_STACKS=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y CONFIG_JH71XX_PMU=y -CONFIG_JUMP_LABEL=y CONFIG_KCMP=y # CONFIG_KERNEL_UNCOMPRESSED is not set CONFIG_LEGACY_DIRECT_IO=y diff --git a/target/linux/starfive/config-6.18 b/target/linux/starfive/config-6.18 index f162b6b58e..6a1449e9c6 100644 --- a/target/linux/starfive/config-6.18 +++ b/target/linux/starfive/config-6.18 @@ -280,7 +280,6 @@ CONFIG_IRQ_STACKS=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y CONFIG_JH71XX_PMU=y -CONFIG_JUMP_LABEL=y CONFIG_KCMP=y # CONFIG_KERNEL_UNCOMPRESSED is not set CONFIG_LEGACY_DIRECT_IO=y