Skip to content

Commit 05c4b40

Browse files
committed
config-cleanup: disable new 6.18 configs enabled by default
Disable the following configs that were auto-enabled by make olddefconfig during the 6.12 -> 6.18 upgrade but are not needed for HCL x86 and arm Signed-off-by: Hardik Garg <hargar@microsoft.com>
1 parent a10e997 commit 05c4b40

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

Microsoft/hcl-arm64.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -468,17 +468,17 @@ CONFIG_AS_HAS_MOPS=y
468468
#
469469
CONFIG_ARM64_POE=y
470470
CONFIG_ARCH_PKEY_BITS=3
471-
CONFIG_ARM64_HAFT=y
471+
# CONFIG_ARM64_HAFT is not set
472472
# end of ARMv8.9 architectural features
473473

474474
#
475475
# ARMv9.4 architectural features
476476
#
477-
CONFIG_ARM64_GCS=y
477+
# CONFIG_ARM64_GCS is not set
478478
# end of ARMv9.4 architectural features
479479

480480
CONFIG_ARM64_SVE=y
481-
CONFIG_ARM64_SME=y
481+
# CONFIG_ARM64_SME is not set
482482
# CONFIG_ARM64_PSEUDO_NMI is not set
483483
CONFIG_RELOCATABLE=y
484484
# CONFIG_RANDOMIZE_BASE is not set
@@ -1764,7 +1764,7 @@ CONFIG_ARM_PMU=y
17641764
CONFIG_ARM_PMUV3=y
17651765
# CONFIG_ARM_DSU_PMU is not set
17661766
# CONFIG_ARM_SPE_PMU is not set
1767-
CONFIG_ARM64_BRBE=y
1767+
# CONFIG_ARM64_BRBE is not set
17681768
# CONFIG_HISI_PCIE_PMU is not set
17691769
# CONFIG_HNS3_PMU is not set
17701770
# CONFIG_DWC_PCIE_PMU is not set
@@ -1983,7 +1983,7 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
19831983
#
19841984
CONFIG_FORTIFY_SOURCE=y
19851985
CONFIG_HARDENED_USERCOPY=y
1986-
CONFIG_HARDENED_USERCOPY_DEFAULT_ON=y
1986+
# CONFIG_HARDENED_USERCOPY_DEFAULT_ON is not set
19871987
# end of Bounds checking
19881988

19891989
#

Microsoft/hcl-x64.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,9 @@ CONFIG_PREFIX_SYMBOLS=y
422422
CONFIG_CPU_MITIGATIONS=y
423423
# CONFIG_MITIGATION_PAGE_TABLE_ISOLATION is not set
424424
CONFIG_MITIGATION_RETPOLINE=y
425-
CONFIG_MITIGATION_RETHUNK=y
426-
CONFIG_MITIGATION_UNRET_ENTRY=y
427-
CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y
425+
# CONFIG_MITIGATION_RETHUNK is not set
426+
# CONFIG_MITIGATION_UNRET_ENTRY is not set
427+
# CONFIG_MITIGATION_CALL_DEPTH_TRACKING is not set
428428
# CONFIG_CALL_THUNKS_DEBUG is not set
429429
CONFIG_MITIGATION_IBPB_ENTRY=y
430430
CONFIG_MITIGATION_IBRS_ENTRY=y
@@ -442,8 +442,8 @@ CONFIG_MITIGATION_IBRS_ENTRY=y
442442
# CONFIG_MITIGATION_SPECTRE_V2 is not set
443443
# CONFIG_MITIGATION_SRBDS is not set
444444
# CONFIG_MITIGATION_SSB is not set
445-
CONFIG_MITIGATION_ITS=y
446-
CONFIG_MITIGATION_TSA=y
445+
# CONFIG_MITIGATION_ITS is not set
446+
# CONFIG_MITIGATION_TSA is not set
447447
CONFIG_ARCH_HAS_ADD_PAGES=y
448448

449449
#

0 commit comments

Comments
 (0)