Skip to content

Commit d0abb26

Browse files
committed
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: 54f9744 ("treewide: disable spectre mitigation on unaffected Arm32 targets") Link: openwrt#16743 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent b881634 commit d0abb26

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

target/linux/mediatek/mt7623/config-6.6

-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ CONFIG_GPIO_CDEV=y
273273
CONFIG_GRO_CELLS=y
274274
# CONFIG_HARDEN_BRANCH_HISTORY is not set
275275
# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
276-
CONFIG_HARDEN_BRANCH_PREDICTOR=y
277276
CONFIG_HARDIRQS_SW_RESEND=y
278277
CONFIG_HAS_DMA=y
279278
CONFIG_HAS_IOMEM=y

target/linux/mediatek/mt7629/config-6.6

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ CONFIG_GPIO_CDEV=y
147147
CONFIG_GRO_CELLS=y
148148
# CONFIG_HARDEN_BRANCH_HISTORY is not set
149149
# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
150-
CONFIG_HARDEN_BRANCH_PREDICTOR=y
151150
CONFIG_HARDIRQS_SW_RESEND=y
152151
CONFIG_HAS_DMA=y
153152
CONFIG_HAS_IOMEM=y

0 commit comments

Comments
 (0)