summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens2024-10-20 13:38:57 +0000
committerHauke Mehrtens2024-10-22 19:13:26 +0000
commitd0abb26f402e6193f6bfe253d42088b09dccbce5 (patch)
treec7ef9e7d791e5e849a9815e392c0a7d4a44dae6f
parentb8816343fbf7f6c14573de43fd86a0ae544abfec (diff)
downloadopenwrt-d0abb26f402e6193f6bfe253d42088b09dccbce5.tar.gz
mediatek: Remove double CONFIG_HARDEN_BRANCH_PREDICTOR
CONFIG_HARDEN_BRANCH_PREDICTOR option is included two times in this configuration file. Remove one definition. On arm32 SoC it should not be needed. Fixes: 54f9744c820a ("treewide: disable spectre mitigation on unaffected Arm32 targets") Link: https://github.com/openwrt/openwrt/pull/16743 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/mediatek/mt7623/config-6.61
-rw-r--r--target/linux/mediatek/mt7629/config-6.61
2 files changed, 0 insertions, 2 deletions
diff --git a/target/linux/mediatek/mt7623/config-6.6 b/target/linux/mediatek/mt7623/config-6.6
index e34822d992..baa31b465d 100644
--- a/target/linux/mediatek/mt7623/config-6.6
+++ b/target/linux/mediatek/mt7623/config-6.6
@@ -273,7 +273,6 @@ CONFIG_GPIO_CDEV=y
CONFIG_GRO_CELLS=y
# CONFIG_HARDEN_BRANCH_HISTORY is not set
# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y
diff --git a/target/linux/mediatek/mt7629/config-6.6 b/target/linux/mediatek/mt7629/config-6.6
index 81c07a5492..5169acb99f 100644
--- a/target/linux/mediatek/mt7629/config-6.6
+++ b/target/linux/mediatek/mt7629/config-6.6
@@ -147,7 +147,6 @@ CONFIG_GPIO_CDEV=y
CONFIG_GRO_CELLS=y
# CONFIG_HARDEN_BRANCH_HISTORY is not set
# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y