Skip to content

Commit 5a4fa48

Browse files
kelsey-steelechessturo
kelsey-steele
authored and
chessturo
committed
configs: Update x86 and arm64 configs under arch/
Configs updated to match latest WSL2 release 5.15.83 Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
1 parent b41ba87 commit 5a4fa48

2 files changed

Lines changed: 22 additions & 18 deletions

File tree

‎arch/arm64/configs/config-wsl-arm64‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 5.15.57.1 Kernel Configuration
3+
# Linux/arm64 5.15.83.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="aarch64-msft-linux-gcc (GCC) 9.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -174,7 +174,7 @@ CONFIG_CGROUP_MISC=y
174174
CONFIG_SOCK_CGROUP_DATA=y
175175
CONFIG_NAMESPACES=y
176176
CONFIG_UTS_NS=y
177-
# CONFIG_TIME_NS is not set
177+
CONFIG_TIME_NS=y
178178
CONFIG_IPC_NS=y
179179
CONFIG_USER_NS=y
180180
CONFIG_PID_NS=y
@@ -345,10 +345,13 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
345345
# CONFIG_ARM64_ERRATUM_1165522 is not set
346346
CONFIG_ARM64_ERRATUM_1319367=y
347347
CONFIG_ARM64_ERRATUM_1530923=y
348+
# CONFIG_ARM64_ERRATUM_2441007 is not set
348349
# CONFIG_ARM64_ERRATUM_1286807 is not set
349350
# CONFIG_ARM64_ERRATUM_1463225 is not set
350351
# CONFIG_ARM64_ERRATUM_1542419 is not set
351352
CONFIG_ARM64_ERRATUM_1508412=y
353+
# CONFIG_ARM64_ERRATUM_2441009 is not set
354+
# CONFIG_ARM64_ERRATUM_2457168 is not set
352355
# CONFIG_CAVIUM_ERRATUM_22375 is not set
353356
# CONFIG_CAVIUM_ERRATUM_23154 is not set
354357
# CONFIG_CAVIUM_ERRATUM_27456 is not set
@@ -590,6 +593,7 @@ CONFIG_HAVE_KRETPROBES=y
590593
CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
591594
CONFIG_HAVE_NMI=y
592595
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
596+
CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
593597
CONFIG_HAVE_ARCH_TRACEHOOK=y
594598
CONFIG_HAVE_DMA_CONTIGUOUS=y
595599
CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -741,7 +745,6 @@ CONFIG_BLOCK_HOLDER_DEPRECATED=y
741745
# CONFIG_IOSCHED_BFQ is not set
742746
# end of IO Schedulers
743747

744-
CONFIG_PADATA=y
745748
CONFIG_ASN1=y
746749
CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
747750
CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
@@ -861,7 +864,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
861864
# CONFIG_ZPOOL is not set
862865
# CONFIG_ZSMALLOC is not set
863866
CONFIG_GENERIC_EARLY_IOREMAP=y
864-
CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
867+
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
865868
# CONFIG_IDLE_PAGE_TRACKING is not set
866869
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
867870
CONFIG_ARCH_HAS_PTE_DEVMAP=y
@@ -932,6 +935,7 @@ CONFIG_INET_ESP=y
932935
# CONFIG_INET_ESP_OFFLOAD is not set
933936
# CONFIG_INET_ESPINTCP is not set
934937
# CONFIG_INET_IPCOMP is not set
938+
CONFIG_INET_TABLE_PERTURB_ORDER=16
935939
CONFIG_INET_TUNNEL=y
936940
CONFIG_INET_DIAG=y
937941
CONFIG_INET_TCP_DIAG=y
@@ -1109,7 +1113,7 @@ CONFIG_NETFILTER_XT_MATCH_HL=y
11091113
CONFIG_NETFILTER_XT_MATCH_IPVS=y
11101114
# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
11111115
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
1112-
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
1116+
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
11131117
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
11141118
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
11151119
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
@@ -1604,7 +1608,6 @@ CONFIG_PROC_EVENTS=y
16041608
# CONFIG_ARM_SCMI_PROTOCOL is not set
16051609
# end of ARM System Control and Management Interface Protocol
16061610

1607-
# CONFIG_ARM_SDE_INTERFACE is not set
16081611
CONFIG_FIRMWARE_MEMMAP=y
16091612
# CONFIG_ISCSI_IBFT is not set
16101613
# CONFIG_FW_CFG_SYSFS is not set
@@ -2045,7 +2048,7 @@ CONFIG_USB_NET_CDC_NCM=y
20452048
# CONFIG_USB_VL600 is not set
20462049
# CONFIG_USB_NET_CH9200 is not set
20472050
# CONFIG_USB_NET_AQC111 is not set
2048-
# CONFIG_USB_RTL8153_ECM is not set
2051+
CONFIG_USB_RTL8153_ECM=y
20492052
# CONFIG_WLAN is not set
20502053
# CONFIG_WAN is not set
20512054

@@ -3789,7 +3792,6 @@ CONFIG_CRYPTO_CRC32C=y
37893792
# CONFIG_CRYPTO_CRC32 is not set
37903793
CONFIG_CRYPTO_XXHASH=y
37913794
CONFIG_CRYPTO_BLAKE2B=y
3792-
# CONFIG_CRYPTO_BLAKE2S is not set
37933795
# CONFIG_CRYPTO_CRCT10DIF is not set
37943796
CONFIG_CRYPTO_GHASH=y
37953797
# CONFIG_CRYPTO_POLY1305 is not set
@@ -4037,6 +4039,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=1
40374039
CONFIG_DEBUG_BUGVERBOSE=y
40384040
# end of printk and dmesg options
40394041

4042+
CONFIG_AS_HAS_NON_CONST_LEB128=y
4043+
40404044
#
40414045
# Compile-time checks and compiler options
40424046
#
@@ -4232,7 +4236,6 @@ CONFIG_UPROBE_EVENTS=y
42324236
CONFIG_BPF_EVENTS=y
42334237
CONFIG_DYNAMIC_EVENTS=y
42344238
CONFIG_PROBE_EVENTS=y
4235-
# CONFIG_BPF_KPROBE_OVERRIDE is not set
42364239
CONFIG_FTRACE_MCOUNT_RECORD=y
42374240
CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
42384241
# CONFIG_SYNTH_EVENTS is not set
@@ -4264,7 +4267,7 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
42644267
#
42654268
# CONFIG_KUNIT is not set
42664269
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
4267-
CONFIG_FUNCTION_ERROR_INJECTION=y
4270+
# CONFIG_FUNCTION_ERROR_INJECTION is not set
42684271
# CONFIG_FAULT_INJECTION is not set
42694272
CONFIG_ARCH_HAS_KCOV=y
42704273
CONFIG_CC_HAS_SANCOV_TRACE_PC=y

‎arch/x86/configs/config-wsl‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 5.15.57.1 Kernel Configuration
3+
# Linux/x86 5.15.83.1 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="x86_64-msft-linux-gcc (GCC) 9.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -194,7 +194,7 @@ CONFIG_CGROUP_MISC=y
194194
CONFIG_SOCK_CGROUP_DATA=y
195195
CONFIG_NAMESPACES=y
196196
CONFIG_UTS_NS=y
197-
# CONFIG_TIME_NS is not set
197+
CONFIG_TIME_NS=y
198198
CONFIG_IPC_NS=y
199199
CONFIG_USER_NS=y
200200
CONFIG_PID_NS=y
@@ -639,6 +639,7 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y
639639
CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
640640
CONFIG_HAVE_NMI=y
641641
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
642+
CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
642643
CONFIG_HAVE_ARCH_TRACEHOOK=y
643644
CONFIG_HAVE_DMA_CONTIGUOUS=y
644645
CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -964,6 +965,7 @@ CONFIG_INET_ESP=y
964965
# CONFIG_INET_ESP_OFFLOAD is not set
965966
# CONFIG_INET_ESPINTCP is not set
966967
# CONFIG_INET_IPCOMP is not set
968+
CONFIG_INET_TABLE_PERTURB_ORDER=16
967969
CONFIG_INET_TUNNEL=y
968970
CONFIG_INET_DIAG=y
969971
CONFIG_INET_TCP_DIAG=y
@@ -1142,7 +1144,7 @@ CONFIG_NETFILTER_XT_MATCH_HL=y
11421144
CONFIG_NETFILTER_XT_MATCH_IPVS=y
11431145
# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
11441146
# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
1145-
# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
1147+
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
11461148
# CONFIG_NETFILTER_XT_MATCH_MAC is not set
11471149
# CONFIG_NETFILTER_XT_MATCH_MARK is not set
11481150
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
@@ -2059,7 +2061,7 @@ CONFIG_USB_NET_CDC_NCM=y
20592061
# CONFIG_USB_VL600 is not set
20602062
# CONFIG_USB_NET_CH9200 is not set
20612063
# CONFIG_USB_NET_AQC111 is not set
2062-
# CONFIG_USB_RTL8153_ECM is not set
2064+
CONFIG_USB_RTL8153_ECM=y
20632065
# CONFIG_WLAN is not set
20642066
# CONFIG_WAN is not set
20652067

@@ -3641,7 +3643,6 @@ CONFIG_CRYPTO_CRC32C=y
36413643
# CONFIG_CRYPTO_CRC32_PCLMUL is not set
36423644
CONFIG_CRYPTO_XXHASH=y
36433645
CONFIG_CRYPTO_BLAKE2B=y
3644-
# CONFIG_CRYPTO_BLAKE2S is not set
36453646
CONFIG_CRYPTO_BLAKE2S_X86=y
36463647
# CONFIG_CRYPTO_CRCT10DIF is not set
36473648
CONFIG_CRYPTO_GHASH=y
@@ -3903,6 +3904,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=1
39033904
CONFIG_DEBUG_BUGVERBOSE=y
39043905
# end of printk and dmesg options
39053906

3907+
CONFIG_AS_HAS_NON_CONST_LEB128=y
3908+
39063909
#
39073910
# Compile-time checks and compiler options
39083911
#
@@ -4110,7 +4113,6 @@ CONFIG_UPROBE_EVENTS=y
41104113
CONFIG_BPF_EVENTS=y
41114114
CONFIG_DYNAMIC_EVENTS=y
41124115
CONFIG_PROBE_EVENTS=y
4113-
# CONFIG_BPF_KPROBE_OVERRIDE is not set
41144116
CONFIG_FTRACE_MCOUNT_RECORD=y
41154117
CONFIG_FTRACE_MCOUNT_USE_CC=y
41164118
# CONFIG_SYNTH_EVENTS is not set
@@ -4133,7 +4135,6 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
41334135
#
41344136
# x86 Debugging
41354137
#
4136-
CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
41374138
# CONFIG_X86_VERBOSE_BOOTUP is not set
41384139
CONFIG_EARLY_PRINTK=y
41394140
# CONFIG_EARLY_PRINTK_DBGP is not set
@@ -4162,7 +4163,7 @@ CONFIG_UNWINDER_ORC=y
41624163
#
41634164
# CONFIG_KUNIT is not set
41644165
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
4165-
CONFIG_FUNCTION_ERROR_INJECTION=y
4166+
# CONFIG_FUNCTION_ERROR_INJECTION is not set
41664167
# CONFIG_FAULT_INJECTION is not set
41674168
CONFIG_ARCH_HAS_KCOV=y
41684169
CONFIG_CC_HAS_SANCOV_TRACE_PC=y

0 commit comments

Comments
 (0)