Skip to content

Commit 47e6dda

Browse files
committed
wsl: config additions for 6.18
- Enabled CONFIG_CPUSETS_V1 in order to keep CONFIG_PROC_PID_CPUSET to avoid breaking things that depend on it - Enabled CONFIG_ANON_VMA_NAME - Enabled a variety of CAN devices and transport protocols - Enabled CONFIG_INPUT_JOYDEV - Enabled CONFIG_LEDS_CLASS_MULTICOLOR to keep CONFIG_HID_LOGITECH and friends - Enabled CONFIG_USB_MON - Enabled CONFIG_MSDOS_FS and CONFIG_VFAT_FS on ARM64 for parity with x86. Enabled CONFIG_EXFAT_FS and CONFIG_F2FS_FS on both ARM64 and x86.
1 parent c209167 commit 47e6dda

2 files changed

Lines changed: 136 additions & 33 deletions

File tree

arch/arm64/configs/config-wsl-arm64

Lines changed: 91 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ CONFIG_CGROUP_RDMA=y
202202
CONFIG_CGROUP_FREEZER=y
203203
CONFIG_CGROUP_HUGETLB=y
204204
CONFIG_CPUSETS=y
205-
# CONFIG_CPUSETS_V1 is not set
205+
CONFIG_CPUSETS_V1=y
206+
CONFIG_PROC_PID_CPUSET=y
206207
CONFIG_CGROUP_DEVICE=y
207208
CONFIG_CGROUP_CPUACCT=y
208209
CONFIG_CGROUP_PERF=y
@@ -1173,7 +1174,7 @@ CONFIG_VM_EVENT_COUNTERS=y
11731174
CONFIG_ARCH_HAS_PTE_SPECIAL=y
11741175
CONFIG_MEMFD_CREATE=y
11751176
CONFIG_SECRETMEM=y
1176-
# CONFIG_ANON_VMA_NAME is not set
1177+
CONFIG_ANON_VMA_NAME=y
11771178
CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
11781179
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
11791180
CONFIG_USERFAULTFD=y
@@ -1947,8 +1948,8 @@ CONFIG_CAN=m
19471948
CONFIG_CAN_RAW=m
19481949
CONFIG_CAN_BCM=m
19491950
CONFIG_CAN_GW=m
1950-
# CONFIG_CAN_J1939 is not set
1951-
# CONFIG_CAN_ISOTP is not set
1951+
CONFIG_CAN_J1939=m
1952+
CONFIG_CAN_ISOTP=m
19521953
CONFIG_BT=m
19531954
CONFIG_BT_BREDR=y
19541955
CONFIG_BT_RFCOMM=m
@@ -3714,7 +3715,56 @@ CONFIG_DP83867_PHY=m
37143715
CONFIG_VITESSE_PHY=m
37153716
CONFIG_XILINX_GMII2RGMII=m
37163717
# CONFIG_PSE_CONTROLLER is not set
3717-
# CONFIG_CAN_DEV is not set
3718+
CONFIG_CAN_DEV=m
3719+
CONFIG_CAN_VCAN=m
3720+
# CONFIG_CAN_VXCAN is not set
3721+
CONFIG_CAN_NETLINK=y
3722+
CONFIG_CAN_CALC_BITTIMING=y
3723+
CONFIG_CAN_RX_OFFLOAD=y
3724+
# CONFIG_CAN_CAN327 is not set
3725+
# CONFIG_CAN_FLEXCAN is not set
3726+
# CONFIG_CAN_GRCAN is not set
3727+
# CONFIG_CAN_KVASER_PCIEFD is not set
3728+
CONFIG_CAN_SLCAN=m
3729+
# CONFIG_CAN_XILINXCAN is not set
3730+
# CONFIG_CAN_C_CAN is not set
3731+
# CONFIG_CAN_CC770 is not set
3732+
# CONFIG_CAN_CTUCANFD_PCI is not set
3733+
# CONFIG_CAN_CTUCANFD_PLATFORM is not set
3734+
# CONFIG_CAN_ESD_402_PCI is not set
3735+
# CONFIG_CAN_IFI_CANFD is not set
3736+
# CONFIG_CAN_M_CAN is not set
3737+
# CONFIG_CAN_PEAK_PCIEFD is not set
3738+
# CONFIG_CAN_RCAR is not set
3739+
# CONFIG_CAN_RCAR_CANFD is not set
3740+
# CONFIG_CAN_ROCKCHIP_CANFD is not set
3741+
# CONFIG_CAN_SJA1000 is not set
3742+
# CONFIG_CAN_SOFTING is not set
3743+
3744+
#
3745+
# CAN SPI interfaces
3746+
#
3747+
# CONFIG_CAN_HI311X is not set
3748+
# CONFIG_CAN_MCP251X is not set
3749+
# CONFIG_CAN_MCP251XFD is not set
3750+
# end of CAN SPI interfaces
3751+
3752+
#
3753+
# CAN USB interfaces
3754+
#
3755+
CONFIG_CAN_8DEV_USB=m
3756+
CONFIG_CAN_EMS_USB=m
3757+
CONFIG_CAN_ESD_USB=m
3758+
CONFIG_CAN_ETAS_ES58X=m
3759+
CONFIG_CAN_F81604=m
3760+
CONFIG_CAN_GS_USB=m
3761+
CONFIG_CAN_KVASER_USB=m
3762+
CONFIG_CAN_MCBA_USB=m
3763+
CONFIG_CAN_PEAK_USB=m
3764+
CONFIG_CAN_UCAN=m
3765+
# end of CAN USB interfaces
3766+
3767+
# CONFIG_CAN_DEBUG_DEVICES is not set
37183768
CONFIG_FWNODE_MDIO=y
37193769
CONFIG_OF_MDIO=y
37203770
CONFIG_ACPI_MDIO=y
@@ -4190,7 +4240,7 @@ CONFIG_INPUT_MOUSEDEV=y
41904240
CONFIG_INPUT_MOUSEDEV_PSAUX=y
41914241
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
41924242
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
4193-
# CONFIG_INPUT_JOYDEV is not set
4243+
CONFIG_INPUT_JOYDEV=m
41944244
# CONFIG_INPUT_EVDEV is not set
41954245

41964246
#
@@ -7281,6 +7331,13 @@ CONFIG_HID_LCPOWER=m
72817331
CONFIG_HID_LED=m
72827332
CONFIG_HID_LENOVO=m
72837333
# CONFIG_HID_LETSKETCH is not set
7334+
CONFIG_HID_LOGITECH=m
7335+
CONFIG_HID_LOGITECH_DJ=m
7336+
CONFIG_HID_LOGITECH_HIDPP=m
7337+
# CONFIG_LOGITECH_FF is not set
7338+
# CONFIG_LOGIRUMBLEPAD2_FF is not set
7339+
# CONFIG_LOGIG940_FF is not set
7340+
# CONFIG_LOGIWHEELS_FF is not set
72847341
CONFIG_HID_MAGICMOUSE=m
72857342
CONFIG_HID_MALTRON=m
72867343
CONFIG_HID_MAYFLASH=m
@@ -7305,6 +7362,7 @@ CONFIG_HID_PICOLCD_LCD=y
73057362
CONFIG_HID_PICOLCD_LEDS=y
73067363
CONFIG_HID_PICOLCD_CIR=y
73077364
CONFIG_HID_PLANTRONICS=m
7365+
# CONFIG_HID_PLAYSTATION is not set
73087366
# CONFIG_HID_PXRC is not set
73097367
# CONFIG_HID_RAZER is not set
73107368
CONFIG_HID_PRIMAX=m
@@ -7401,7 +7459,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
74017459
# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
74027460
CONFIG_USB_AUTOSUSPEND_DELAY=2
74037461
CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
7404-
# CONFIG_USB_MON is not set
7462+
CONFIG_USB_MON=m
74057463

74067464
#
74077465
# USB Host Controller Drivers
@@ -7800,7 +7858,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=m
78007858
CONFIG_NEW_LEDS=y
78017859
CONFIG_LEDS_CLASS=m
78027860
# CONFIG_LEDS_CLASS_FLASH is not set
7803-
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
7861+
CONFIG_LEDS_CLASS_MULTICOLOR=m
78047862
# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
78057863

78067864
#
@@ -7817,10 +7875,13 @@ CONFIG_LEDS_CLASS=m
78177875
# CONFIG_LEDS_LM3532 is not set
78187876
# CONFIG_LEDS_LM3642 is not set
78197877
# CONFIG_LEDS_LM3692X is not set
7878+
# CONFIG_LEDS_SUN50I_A100 is not set
78207879
# CONFIG_LEDS_PCA9532 is not set
78217880
# CONFIG_LEDS_GPIO is not set
78227881
# CONFIG_LEDS_LP3944 is not set
78237882
# CONFIG_LEDS_LP3952 is not set
7883+
# CONFIG_LEDS_LP50XX is not set
7884+
# CONFIG_LEDS_LP55XX_COMMON is not set
78247885
# CONFIG_LEDS_LP8860 is not set
78257886
# CONFIG_LEDS_LP8864 is not set
78267887
# CONFIG_LEDS_PCA955X is not set
@@ -7855,6 +7916,9 @@ CONFIG_LEDS_BCM63138=m
78557916
#
78567917
# RGB LED drivers
78577918
#
7919+
# CONFIG_LEDS_GROUP_MULTICOLOR is not set
7920+
# CONFIG_LEDS_KTD202X is not set
7921+
# CONFIG_LEDS_NCP5623 is not set
78587922

78597923
#
78607924
# LED Triggers
@@ -9971,6 +10035,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
997110035
CONFIG_FS_IOMAP=y
997210036
CONFIG_FS_STACK=y
997310037
CONFIG_BUFFER_HEAD=y
10038+
CONFIG_LEGACY_DIRECT_IO=y
997410039
CONFIG_EXT2_FS=y
997510040
# CONFIG_EXT2_FS_XATTR is not set
997610041
CONFIG_EXT4_FS=y
@@ -9999,7 +10064,16 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
999910064
# CONFIG_BTRFS_ASSERT is not set
1000010065
# CONFIG_BTRFS_EXPERIMENTAL is not set
1000110066
# CONFIG_NILFS2_FS is not set
10002-
# CONFIG_F2FS_FS is not set
10067+
CONFIG_F2FS_FS=m
10068+
CONFIG_F2FS_STAT_FS=y
10069+
CONFIG_F2FS_FS_XATTR=y
10070+
CONFIG_F2FS_FS_POSIX_ACL=y
10071+
# CONFIG_F2FS_FS_SECURITY is not set
10072+
# CONFIG_F2FS_CHECK_FS is not set
10073+
# CONFIG_F2FS_FAULT_INJECTION is not set
10074+
# CONFIG_F2FS_FS_COMPRESSION is not set
10075+
CONFIG_F2FS_IOSTAT=y
10076+
# CONFIG_F2FS_UNFAIR_RWSEM is not set
1000310077
# CONFIG_ZONEFS_FS is not set
1000410078
CONFIG_FS_DAX=y
1000510079
CONFIG_FS_DAX_PMD=y
@@ -10059,9 +10133,14 @@ CONFIG_ISO9660_FS=m
1005910133
#
1006010134
# DOS/FAT/EXFAT/NT Filesystems
1006110135
#
10062-
# CONFIG_MSDOS_FS is not set
10063-
# CONFIG_VFAT_FS is not set
10064-
# CONFIG_EXFAT_FS is not set
10136+
CONFIG_FAT_FS=y
10137+
CONFIG_MSDOS_FS=m
10138+
CONFIG_VFAT_FS=y
10139+
CONFIG_FAT_DEFAULT_CODEPAGE=437
10140+
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
10141+
# CONFIG_FAT_DEFAULT_UTF8 is not set
10142+
CONFIG_EXFAT_FS=m
10143+
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
1006510144
# CONFIG_NTFS3_FS is not set
1006610145
# CONFIG_NTFS_FS is not set
1006710146
# end of DOS/FAT/EXFAT/NT Filesystems

arch/x86/configs/config-wsl

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ CONFIG_CGROUP_RDMA=y
216216
CONFIG_CGROUP_FREEZER=y
217217
CONFIG_CGROUP_HUGETLB=y
218218
CONFIG_CPUSETS=y
219-
# CONFIG_CPUSETS_V1 is not set
219+
CONFIG_CPUSETS_V1=y
220+
CONFIG_PROC_PID_CPUSET=y
220221
CONFIG_CGROUP_DEVICE=y
221222
CONFIG_CGROUP_CPUACCT=y
222223
CONFIG_CGROUP_PERF=y
@@ -1219,7 +1220,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
12191220
CONFIG_MAPPING_DIRTY_HELPERS=y
12201221
CONFIG_MEMFD_CREATE=y
12211222
CONFIG_SECRETMEM=y
1222-
# CONFIG_ANON_VMA_NAME is not set
1223+
CONFIG_ANON_VMA_NAME=y
12231224
CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
12241225
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
12251226
CONFIG_USERFAULTFD=y
@@ -1896,8 +1897,8 @@ CONFIG_CAN=m
18961897
CONFIG_CAN_RAW=m
18971898
CONFIG_CAN_BCM=m
18981899
CONFIG_CAN_GW=m
1899-
# CONFIG_CAN_J1939 is not set
1900-
# CONFIG_CAN_ISOTP is not set
1900+
CONFIG_CAN_J1939=m
1901+
CONFIG_CAN_ISOTP=m
19011902
CONFIG_BT=m
19021903
CONFIG_BT_BREDR=y
19031904
CONFIG_BT_RFCOMM=m
@@ -3023,13 +3024,14 @@ CONFIG_STE10XP=m
30233024
# CONFIG_VITESSE_PHY is not set
30243025
# CONFIG_XILINX_GMII2RGMII is not set
30253026
CONFIG_CAN_DEV=m
3026-
# CONFIG_CAN_VCAN is not set
3027+
CONFIG_CAN_VCAN=m
30273028
# CONFIG_CAN_VXCAN is not set
30283029
CONFIG_CAN_NETLINK=y
30293030
CONFIG_CAN_CALC_BITTIMING=y
3031+
CONFIG_CAN_RX_OFFLOAD=y
30303032
# CONFIG_CAN_CAN327 is not set
30313033
# CONFIG_CAN_KVASER_PCIEFD is not set
3032-
# CONFIG_CAN_SLCAN is not set
3034+
CONFIG_CAN_SLCAN=m
30333035
# CONFIG_CAN_C_CAN is not set
30343036
# CONFIG_CAN_CC770 is not set
30353037
# CONFIG_CAN_CTUCANFD_PCI is not set
@@ -3043,16 +3045,16 @@ CONFIG_CAN_CALC_BITTIMING=y
30433045
#
30443046
# CAN USB interfaces
30453047
#
3046-
# CONFIG_CAN_8DEV_USB is not set
3047-
# CONFIG_CAN_EMS_USB is not set
3048-
# CONFIG_CAN_ESD_USB is not set
3049-
# CONFIG_CAN_ETAS_ES58X is not set
3050-
# CONFIG_CAN_F81604 is not set
3051-
# CONFIG_CAN_GS_USB is not set
3052-
# CONFIG_CAN_KVASER_USB is not set
3053-
# CONFIG_CAN_MCBA_USB is not set
3054-
# CONFIG_CAN_PEAK_USB is not set
3055-
# CONFIG_CAN_UCAN is not set
3048+
CONFIG_CAN_8DEV_USB=m
3049+
CONFIG_CAN_EMS_USB=m
3050+
CONFIG_CAN_ESD_USB=m
3051+
CONFIG_CAN_ETAS_ES58X=m
3052+
CONFIG_CAN_F81604=m
3053+
CONFIG_CAN_GS_USB=m
3054+
CONFIG_CAN_KVASER_USB=m
3055+
CONFIG_CAN_MCBA_USB=m
3056+
CONFIG_CAN_PEAK_USB=m
3057+
CONFIG_CAN_UCAN=m
30563058
# end of CAN USB interfaces
30573059

30583060
# CONFIG_CAN_DEBUG_DEVICES is not set
@@ -3283,7 +3285,7 @@ CONFIG_INPUT_MOUSEDEV=m
32833285
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
32843286
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
32853287
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
3286-
# CONFIG_INPUT_JOYDEV is not set
3288+
CONFIG_INPUT_JOYDEV=m
32873289
CONFIG_INPUT_EVDEV=m
32883290

32893291
#
@@ -5872,6 +5874,13 @@ CONFIG_HID_EZKEY=m
58725874
# CONFIG_HID_LED is not set
58735875
# CONFIG_HID_LENOVO is not set
58745876
# CONFIG_HID_LETSKETCH is not set
5877+
CONFIG_HID_LOGITECH=m
5878+
CONFIG_HID_LOGITECH_DJ=m
5879+
CONFIG_HID_LOGITECH_HIDPP=m
5880+
# CONFIG_LOGITECH_FF is not set
5881+
# CONFIG_LOGIRUMBLEPAD2_FF is not set
5882+
# CONFIG_LOGIG940_FF is not set
5883+
# CONFIG_LOGIWHEELS_FF is not set
58755884
# CONFIG_HID_MAGICMOUSE is not set
58765885
# CONFIG_HID_MALTRON is not set
58775886
# CONFIG_HID_MAYFLASH is not set
@@ -5890,6 +5899,7 @@ CONFIG_HID_MONTEREY=m
58905899
# CONFIG_HID_PETALYNX is not set
58915900
# CONFIG_HID_PICOLCD is not set
58925901
# CONFIG_HID_PLANTRONICS is not set
5902+
# CONFIG_HID_PLAYSTATION is not set
58935903
# CONFIG_HID_PXRC is not set
58945904
# CONFIG_HID_RAZER is not set
58955905
# CONFIG_HID_PRIMAX is not set
@@ -5994,7 +6004,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
59946004
# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
59956005
CONFIG_USB_AUTOSUSPEND_DELAY=2
59966006
CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
5997-
# CONFIG_USB_MON is not set
6007+
CONFIG_USB_MON=m
59986008

59996009
#
60006010
# USB Host Controller Drivers
@@ -6214,7 +6224,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=m
62146224
CONFIG_NEW_LEDS=y
62156225
CONFIG_LEDS_CLASS=m
62166226
# CONFIG_LEDS_CLASS_FLASH is not set
6217-
# CONFIG_LEDS_CLASS_MULTICOLOR is not set
6227+
CONFIG_LEDS_CLASS_MULTICOLOR=m
62186228
# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
62196229

62206230
#
@@ -6229,6 +6239,7 @@ CONFIG_LEDS_CLASS=m
62296239
# CONFIG_LEDS_GPIO is not set
62306240
# CONFIG_LEDS_LP3944 is not set
62316241
# CONFIG_LEDS_LP3952 is not set
6242+
# CONFIG_LEDS_LP50XX is not set
62326243
# CONFIG_LEDS_PCA955X is not set
62336244
# CONFIG_LEDS_PCA963X is not set
62346245
# CONFIG_LEDS_PCA995X is not set
@@ -6258,6 +6269,8 @@ CONFIG_LEDS_CLASS=m
62586269
#
62596270
# RGB LED drivers
62606271
#
6272+
# CONFIG_LEDS_KTD202X is not set
6273+
# CONFIG_LEDS_PWM_MULTICOLOR is not set
62616274

62626275
#
62636276
# LED Triggers
@@ -6761,6 +6774,7 @@ CONFIG_INTEL_SCU_PCI=y
67616774
# CONFIG_INTEL_SCU_PLATFORM is not set
67626775
CONFIG_INTEL_SCU_IPC_UTIL=y
67636776
# CONFIG_SIEMENS_SIMATIC_IPC is not set
6777+
# CONFIG_SILICOM_PLATFORM is not set
67646778
# CONFIG_WINMATE_FM07_KEYS is not set
67656779
# CONFIG_OXP_EC is not set
67666780
# CONFIG_TUXEDO_NB04_WMI_AB is not set
@@ -7517,7 +7531,16 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
75177531
# CONFIG_BTRFS_ASSERT is not set
75187532
# CONFIG_BTRFS_EXPERIMENTAL is not set
75197533
# CONFIG_NILFS2_FS is not set
7520-
# CONFIG_F2FS_FS is not set
7534+
CONFIG_F2FS_FS=m
7535+
CONFIG_F2FS_STAT_FS=y
7536+
CONFIG_F2FS_FS_XATTR=y
7537+
CONFIG_F2FS_FS_POSIX_ACL=y
7538+
# CONFIG_F2FS_FS_SECURITY is not set
7539+
# CONFIG_F2FS_CHECK_FS is not set
7540+
# CONFIG_F2FS_FAULT_INJECTION is not set
7541+
# CONFIG_F2FS_FS_COMPRESSION is not set
7542+
CONFIG_F2FS_IOSTAT=y
7543+
# CONFIG_F2FS_UNFAIR_RWSEM is not set
75217544
# CONFIG_ZONEFS_FS is not set
75227545
CONFIG_FS_DAX=y
75237546
CONFIG_FS_DAX_PMD=y
@@ -7583,7 +7606,8 @@ CONFIG_VFAT_FS=y
75837606
CONFIG_FAT_DEFAULT_CODEPAGE=437
75847607
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
75857608
# CONFIG_FAT_DEFAULT_UTF8 is not set
7586-
# CONFIG_EXFAT_FS is not set
7609+
CONFIG_EXFAT_FS=m
7610+
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
75877611
# CONFIG_NTFS3_FS is not set
75887612
# CONFIG_NTFS_FS is not set
75897613
# end of DOS/FAT/EXFAT/NT Filesystems

0 commit comments

Comments
 (0)