Skip to content

Commit a3f5289

Browse files
author
Naman Jain
committed
Microsoft: Update config changes with LTS
Update config to the one that finally gets generated after compilation. This changed a bit with changing LLVM and RUST versions and due to earlier config and LTS changes. No functional changes intended. Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
1 parent ece6b79 commit a3f5289

2 files changed

Lines changed: 18 additions & 20 deletions

File tree

Microsoft/hcl-arm64.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.18.0 Kernel Configuration
3+
# Linux/arm64 6.18.37 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24200
1111
CONFIG_LD_IS_BFD=y
1212
CONFIG_LD_VERSION=24200
1313
CONFIG_LLD_VERSION=0
14-
CONFIG_RUSTC_VERSION=109101
15-
CONFIG_RUSTC_LLVM_VERSION=210102
14+
CONFIG_RUSTC_VERSION=109500
15+
CONFIG_RUSTC_LLVM_VERSION=220102
1616
CONFIG_CC_CAN_LINK=y
1717
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1818
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -338,6 +338,7 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
338338
# CONFIG_ARM64_ERRATUM_1165522 is not set
339339
CONFIG_ARM64_ERRATUM_1319367=y
340340
CONFIG_ARM64_ERRATUM_1530923=y
341+
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
341342
# CONFIG_ARM64_ERRATUM_2441007 is not set
342343
# CONFIG_ARM64_ERRATUM_1286807 is not set
343344
# CONFIG_ARM64_ERRATUM_1463225 is not set
@@ -356,6 +357,7 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
356357
CONFIG_ARM64_ERRATUM_2966298=y
357358
CONFIG_ARM64_ERRATUM_3117295=y
358359
CONFIG_ARM64_ERRATUM_3194386=y
360+
CONFIG_ARM64_ERRATUM_4118414=y
359361
# CONFIG_CAVIUM_ERRATUM_22375 is not set
360362
# CONFIG_CAVIUM_ERRATUM_23154 is not set
361363
# CONFIG_CAVIUM_ERRATUM_27456 is not set
@@ -644,7 +646,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
644646
CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
645647
CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
646648
CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
647-
CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
648649
CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
649650

650651
#
@@ -818,13 +819,13 @@ CONFIG_ARCH_HAS_PKEYS=y
818819
CONFIG_ARCH_HAS_PTE_SPECIAL=y
819820
CONFIG_MEMFD_CREATE=y
820821
CONFIG_SECRETMEM=y
822+
# CONFIG_ANON_VMA_NAME is not set
821823
# CONFIG_USERFAULTFD is not set
822824
# CONFIG_LRU_GEN is not set
823825
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
824826
CONFIG_PER_VMA_LOCK=y
825827
CONFIG_LOCK_MM_AND_FIND_VMA=y
826828
CONFIG_EXECMEM=y
827-
CONFIG_ARCH_HAS_USER_SHADOW_STACK=y
828829

829830
#
830831
# Data Access Monitoring
@@ -2397,7 +2398,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
23972398

23982399
# CONFIG_DEBUG_IRQFLAGS is not set
23992400
CONFIG_STACKTRACE=y
2400-
# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
24012401
# CONFIG_DEBUG_KOBJECT is not set
24022402

24032403
#

Microsoft/hcl-x64.config

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.18.0 Kernel Configuration
3+
# Linux/x86_64 6.18.37 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24200
1111
CONFIG_LD_IS_BFD=y
1212
CONFIG_LD_VERSION=24200
1313
CONFIG_LLD_VERSION=0
14-
CONFIG_RUSTC_VERSION=109101
15-
CONFIG_RUSTC_LLVM_VERSION=210102
14+
CONFIG_RUSTC_VERSION=109500
15+
CONFIG_RUSTC_LLVM_VERSION=220102
1616
CONFIG_CC_CAN_LINK=y
1717
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
1818
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -305,6 +305,7 @@ CONFIG_ARCH_CPUIDLE_HALTPOLL=y
305305
# CONFIG_JAILHOUSE_GUEST is not set
306306
# CONFIG_ACRN_GUEST is not set
307307
# CONFIG_BHYVE_GUEST is not set
308+
# CONFIG_INTEL_TDX_GUEST is not set
308309
CONFIG_CC_HAS_MARCH_NATIVE=y
309310
# CONFIG_X86_NATIVE_CPU is not set
310311
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
@@ -356,6 +357,7 @@ CONFIG_MICROCODE=y
356357
CONFIG_X86_MSR=y
357358
# CONFIG_X86_CPUID is not set
358359
CONFIG_X86_DIRECT_GBPAGES=y
360+
# CONFIG_AMD_MEM_ENCRYPT is not set
359361
CONFIG_NUMA=y
360362
CONFIG_AMD_NUMA=y
361363
CONFIG_NODES_SHIFT=6
@@ -415,20 +417,12 @@ CONFIG_CC_HAS_RETURN_THUNK=y
415417
CONFIG_CC_HAS_ENTRY_PADDING=y
416418
CONFIG_FUNCTION_PADDING_CFI=11
417419
CONFIG_FUNCTION_PADDING_BYTES=16
418-
CONFIG_CALL_PADDING=y
419-
CONFIG_HAVE_CALL_THUNKS=y
420-
CONFIG_CALL_THUNKS=y
421-
CONFIG_PREFIX_SYMBOLS=y
422420
CONFIG_CPU_MITIGATIONS=y
423421
# CONFIG_MITIGATION_PAGE_TABLE_ISOLATION is not set
424422
CONFIG_MITIGATION_RETPOLINE=y
425423
# CONFIG_MITIGATION_RETHUNK is not set
426-
# CONFIG_MITIGATION_UNRET_ENTRY is not set
427-
# CONFIG_MITIGATION_CALL_DEPTH_TRACKING is not set
428-
# CONFIG_CALL_THUNKS_DEBUG is not set
429424
CONFIG_MITIGATION_IBPB_ENTRY=y
430425
CONFIG_MITIGATION_IBRS_ENTRY=y
431-
# CONFIG_MITIGATION_SRSO is not set
432426
# CONFIG_MITIGATION_SLS is not set
433427
# CONFIG_MITIGATION_GDS is not set
434428
# CONFIG_MITIGATION_RFDS is not set
@@ -442,7 +436,6 @@ CONFIG_MITIGATION_IBRS_ENTRY=y
442436
# CONFIG_MITIGATION_SPECTRE_V2 is not set
443437
# CONFIG_MITIGATION_SRBDS is not set
444438
# CONFIG_MITIGATION_SSB is not set
445-
# CONFIG_MITIGATION_ITS is not set
446439
# CONFIG_MITIGATION_TSA is not set
447440
CONFIG_ARCH_HAS_ADD_PAGES=y
448441

@@ -471,7 +464,6 @@ CONFIG_ARCH_SUPPORTS_ACPI=y
471464
# Bus options (PCI etc.)
472465
#
473466
CONFIG_PCI_DIRECT=y
474-
# CONFIG_PCI_CNB20LE_QUIRK is not set
475467
# CONFIG_ISA_BUS is not set
476468
# CONFIG_ISA_DMA_API is not set
477469
CONFIG_AMD_NB=y
@@ -508,6 +500,9 @@ CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
508500
CONFIG_X86_DISABLED_FEATURE_PKU=y
509501
CONFIG_X86_DISABLED_FEATURE_OSPKE=y
510502
CONFIG_X86_DISABLED_FEATURE_PTI=y
503+
CONFIG_X86_DISABLED_FEATURE_RETHUNK=y
504+
CONFIG_X86_DISABLED_FEATURE_UNRET=y
505+
CONFIG_X86_DISABLED_FEATURE_CALL_DEPTH=y
511506
CONFIG_X86_DISABLED_FEATURE_LAM=y
512507
CONFIG_X86_DISABLED_FEATURE_ENQCMD=y
513508
CONFIG_X86_DISABLED_FEATURE_SGX=y
@@ -544,6 +539,7 @@ CONFIG_JUMP_LABEL=y
544539
# CONFIG_STATIC_CALL_SELFTEST is not set
545540
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
546541
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
542+
CONFIG_USER_RETURN_NOTIFIER=y
547543
CONFIG_HAVE_IOREMAP_PROT=y
548544
CONFIG_HAVE_KPROBES=y
549545
CONFIG_HAVE_KRETPROBES=y
@@ -574,6 +570,8 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
574570
CONFIG_HAVE_USER_RETURN_NOTIFIER=y
575571
CONFIG_HAVE_PERF_EVENTS_NMI=y
576572
CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
573+
CONFIG_UNWIND_USER=y
574+
CONFIG_HAVE_UNWIND_USER_FP=y
577575
CONFIG_HAVE_PERF_REGS=y
578576
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
579577
CONFIG_HAVE_ARCH_JUMP_LABEL=y
@@ -842,6 +840,7 @@ CONFIG_VMAP_PFN=y
842840
CONFIG_ARCH_HAS_PTE_SPECIAL=y
843841
CONFIG_MEMFD_CREATE=y
844842
CONFIG_SECRETMEM=y
843+
# CONFIG_ANON_VMA_NAME is not set
845844
# CONFIG_USERFAULTFD is not set
846845
# CONFIG_LRU_GEN is not set
847846
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
@@ -2343,7 +2342,6 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
23432342
# CONFIG_NMI_CHECK_CPU is not set
23442343
# CONFIG_DEBUG_IRQFLAGS is not set
23452344
CONFIG_STACKTRACE=y
2346-
# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
23472345
# CONFIG_DEBUG_KOBJECT is not set
23482346

23492347
#

0 commit comments

Comments
 (0)