Home Explore Help
Sign In
OpenWrt
/
openwrt
mirror of https://github.com/openwrt/openwrt.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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 <[email protected]>
Hauke Mehrtens 1 year ago
parent
b8816343fb
commit
d0abb26f40
2 changed files with 0 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 1
      target/linux/mediatek/mt7623/config-6.6
  2. 0 1
      target/linux/mediatek/mt7629/config-6.6

+ 0 - 1
target/linux/mediatek/mt7623/config-6.6
View File 

@@ -273,7 +273,6 @@ CONFIG_GPIO_CDEV=y
 
 CONFIG_GRO_CELLS=y
 
 CONFIG_GRO_CELLS=y
 
 # CONFIG_HARDEN_BRANCH_HISTORY is not set
 
 # CONFIG_HARDEN_BRANCH_HISTORY is not set
 
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
 
 CONFIG_HARDIRQS_SW_RESEND=y
 
 CONFIG_HARDIRQS_SW_RESEND=y
 
 CONFIG_HAS_DMA=y
 
 CONFIG_HAS_DMA=y
 
 CONFIG_HAS_IOMEM=y
 
 CONFIG_HAS_IOMEM=y

+ 0 - 1
target/linux/mediatek/mt7629/config-6.6
View File 

@@ -147,7 +147,6 @@ CONFIG_GPIO_CDEV=y
 
 CONFIG_GRO_CELLS=y
 
 CONFIG_GRO_CELLS=y
 
 # CONFIG_HARDEN_BRANCH_HISTORY is not set
 
 # CONFIG_HARDEN_BRANCH_HISTORY is not set
 
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
 
 CONFIG_HARDIRQS_SW_RESEND=y
 
 CONFIG_HARDIRQS_SW_RESEND=y
 
 CONFIG_HAS_DMA=y
 
 CONFIG_HAS_DMA=y
 
 CONFIG_HAS_IOMEM=y
 
 CONFIG_HAS_IOMEM=y