Skip to content

Commit

Permalink
mediatek: Remove double CONFIG_HARDEN_BRANCH_PREDICTOR
Browse files Browse the repository at this point in the history
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/openwrt#16743
Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
hauke committed Oct 22, 2024
1 parent b881634 commit d0abb26
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion target/linux/mediatek/mt7623/config-6.6
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion target/linux/mediatek/mt7629/config-6.6
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d0abb26

Please sign in to comment.