Skip to content

Commit 9660999

Browse files
authored
Merge pull request torvalds#598 from lrh2000/min-config
lkl: Drop unnecessary config selects
2 parents 7a3e989 + cdd533f commit 9660999

File tree

3 files changed

+95
-128
lines changed

3 files changed

+95
-128
lines changed

arch/lkl/Kconfig

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,6 @@ config LKL
1010
select NO_HZ_IDLE
1111
select NO_PREEMPT
1212
select ARCH_WANT_FRAME_POINTERS
13-
select NET
14-
select MULTIUSER
15-
select INET
16-
select IPV6
17-
select IP_PNP
18-
select IP_PNP_DHCP
19-
select TCP_CONG_ADVANCED
20-
select TCP_CONG_BBR
21-
select HIGH_RES_TIMERS
22-
select NET_SCHED
23-
select NET_SCH_FQ
24-
select IP_MULTICAST
25-
select IPV6_MULTICAST
26-
select IP_MULTIPLE_TABLES
27-
select IPV6_MULTIPLE_TABLES
28-
select IP_ROUTE_MULTIPATH
29-
select IPV6_ROUTE_MULTIPATH
30-
select IP_ADVANCED_ROUTER
31-
select IPV6_ADVANCED_ROUTER
32-
select BLK_DEV_NVME
3313
select UACCESS_MEMCPY
3414
select GENERIC_STRNCPY_FROM_USER
3515
select GENERIC_STRNLEN_USER

arch/lkl/configs/defconfig

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
CONFIG_NO_HZ_IDLE=y
3+
CONFIG_HIGH_RES_TIMERS=y
4+
CONFIG_EXPERT=y
35
# CONFIG_SYSFS_SYSCALL is not set
46
# CONFIG_BASE_FULL is not set
57
# CONFIG_FUTEX is not set
@@ -9,13 +11,25 @@ CONFIG_NO_HZ_IDLE=y
911
# CONFIG_ADVISE_SYSCALLS is not set
1012
CONFIG_KALLSYMS_ALL=y
1113
CONFIG_KALLSYMS_USE_DATA_SECTION=y
12-
CONFIG_EXPERT=y
13-
# CONFIG_VM_EVENT_COUNTERS is not set
1414
# CONFIG_COMPAT_BRK is not set
15-
# CONFIG_BLK_DEV_BSG is not set
15+
# CONFIG_VM_EVENT_COUNTERS is not set
16+
CONFIG_NET=y
17+
CONFIG_INET=y
18+
CONFIG_IP_MULTICAST=y
19+
CONFIG_IP_ADVANCED_ROUTER=y
20+
CONFIG_IP_MULTIPLE_TABLES=y
21+
CONFIG_IP_ROUTE_MULTIPATH=y
22+
CONFIG_IP_PNP=y
23+
CONFIG_IP_PNP_DHCP=y
24+
CONFIG_TCP_CONG_ADVANCED=y
25+
CONFIG_TCP_CONG_BBR=y
26+
CONFIG_IPV6_MULTIPLE_TABLES=y
27+
CONFIG_NET_SCHED=y
28+
CONFIG_NET_SCH_FQ=y
1629
# CONFIG_WIRELESS is not set
1730
# CONFIG_FW_LOADER is not set
1831
CONFIG_VIRTIO_BLK=y
32+
CONFIG_BLK_DEV_NVME=y
1933
CONFIG_NETDEVICES=y
2034
CONFIG_VIRTIO_NET=y
2135
# CONFIG_ETHERNET is not set
@@ -86,4 +100,3 @@ CONFIG_NLS_UTF8=y
86100
CONFIG_CRYPTO_ANSI_CPRNG=y
87101
CONFIG_PRINTK_TIME=y
88102
CONFIG_DEBUG_INFO_DWARF4=y
89-
# CONFIG_ENABLE_MUST_CHECK is not set

arch/lkl/configs/fuzzing_defconfig

Lines changed: 78 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,53 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
CONFIG_NO_HZ_IDLE=y
3+
CONFIG_HIGH_RES_TIMERS=y
4+
CONFIG_EXPERT=y
35
# CONFIG_SYSFS_SYSCALL is not set
4-
CONFIG_KALLSYMS_USE_DATA_SECTION=y
5-
CONFIG_KALLSYMS_ALL=y
66
# CONFIG_BASE_FULL is not set
77
# CONFIG_FUTEX is not set
88
# CONFIG_SIGNALFD is not set
99
# CONFIG_TIMERFD is not set
1010
# CONFIG_AIO is not set
1111
# CONFIG_ADVISE_SYSCALLS is not set
12-
CONFIG_EXPERT=y
13-
# CONFIG_VM_EVENT_COUNTERS is not set
12+
CONFIG_KALLSYMS_ALL=y
13+
CONFIG_KALLSYMS_USE_DATA_SECTION=y
1414
# CONFIG_COMPAT_BRK is not set
15-
# CONFIG_BLK_DEV_BSG is not set
15+
# CONFIG_VM_EVENT_COUNTERS is not set
1616
CONFIG_NET=y
1717
CONFIG_INET=y
18+
CONFIG_IP_MULTICAST=y
19+
CONFIG_IP_ADVANCED_ROUTER=y
20+
CONFIG_IP_MULTIPLE_TABLES=y
21+
CONFIG_IP_ROUTE_MULTIPATH=y
22+
CONFIG_IP_PNP=y
23+
CONFIG_IP_PNP_DHCP=y
24+
CONFIG_TCP_CONG_ADVANCED=y
25+
CONFIG_TCP_CONG_BBR=y
26+
CONFIG_IPV6_MULTIPLE_TABLES=y
27+
CONFIG_NET_SCHED=y
28+
CONFIG_NET_SCH_FQ=y
29+
CONFIG_VSOCKETS=y
30+
CONFIG_VIRTIO_VSOCKETS=y
1831
# CONFIG_WIRELESS is not set
19-
# CONFIG_UEVENT_HELPER is not set
32+
CONFIG_DEVTMPFS=y
2033
# CONFIG_FW_LOADER is not set
2134
CONFIG_VIRTIO_BLK=y
35+
CONFIG_BLK_DEV_NVME=y
2236
CONFIG_NETDEVICES=y
2337
CONFIG_VIRTIO_NET=y
24-
CONFIG_VHOST_VSOCK=y
25-
CONFIG_VIRTIO_VSOCKETS=y
26-
CONFIG_VSOCKETS=y
2738
# CONFIG_ETHERNET is not set
2839
# CONFIG_WLAN is not set
2940
# CONFIG_VT is not set
30-
CONFIG_VIRTIO_MMIO=y
31-
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
32-
# CONFIG_FILE_LOCKING is not set
33-
# CONFIG_DNOTIFY is not set
34-
# CONFIG_INOTIFY_USER is not set
35-
CONFIG_VFAT_FS=y
36-
CONFIG_NLS_CODEPAGE_437=y
37-
CONFIG_NLS_CODEPAGE_737=y
38-
CONFIG_NLS_CODEPAGE_775=y
39-
CONFIG_NLS_CODEPAGE_850=y
40-
CONFIG_NLS_CODEPAGE_852=y
41-
CONFIG_NLS_CODEPAGE_855=y
42-
CONFIG_NLS_CODEPAGE_857=y
43-
CONFIG_NLS_CODEPAGE_860=y
44-
CONFIG_NLS_CODEPAGE_861=y
45-
CONFIG_NLS_CODEPAGE_862=y
46-
CONFIG_NLS_CODEPAGE_863=y
47-
CONFIG_NLS_CODEPAGE_864=y
48-
CONFIG_NLS_CODEPAGE_865=y
49-
CONFIG_NLS_CODEPAGE_866=y
50-
CONFIG_NLS_CODEPAGE_869=y
51-
CONFIG_NLS_CODEPAGE_936=y
52-
CONFIG_NLS_CODEPAGE_950=y
53-
CONFIG_NLS_CODEPAGE_932=y
54-
CONFIG_NLS_CODEPAGE_949=y
55-
CONFIG_NLS_CODEPAGE_874=y
56-
CONFIG_NLS_ISO8859_8=y
57-
CONFIG_NLS_CODEPAGE_1250=y
58-
CONFIG_NLS_CODEPAGE_1251=y
59-
CONFIG_NLS_ASCII=y
60-
CONFIG_NLS_ISO8859_1=y
61-
CONFIG_NLS_ISO8859_2=y
62-
CONFIG_NLS_ISO8859_3=y
63-
CONFIG_NLS_ISO8859_4=y
64-
CONFIG_NLS_ISO8859_5=y
65-
CONFIG_NLS_ISO8859_6=y
66-
CONFIG_NLS_ISO8859_7=y
67-
CONFIG_NLS_ISO8859_9=y
68-
CONFIG_NLS_ISO8859_13=y
69-
CONFIG_NLS_ISO8859_14=y
70-
CONFIG_NLS_ISO8859_15=y
71-
CONFIG_NLS_KOI8_R=y
72-
CONFIG_NLS_KOI8_U=y
73-
CONFIG_NLS_MAC_ROMAN=y
74-
CONFIG_NLS_MAC_CELTIC=y
75-
CONFIG_NLS_MAC_CENTEURO=y
76-
CONFIG_NLS_MAC_CROATIAN=y
77-
CONFIG_NLS_MAC_CYRILLIC=y
78-
CONFIG_NLS_MAC_GAELIC=y
79-
CONFIG_NLS_MAC_GREEK=y
80-
CONFIG_NLS_MAC_ICELAND=y
81-
CONFIG_NLS_MAC_INUIT=y
82-
CONFIG_NLS_MAC_ROMANIAN=y
83-
CONFIG_NLS_MAC_TURKISH=y
84-
CONFIG_NLS_UTF8=y
85-
CONFIG_HZ_100=y
86-
CONFIG_CRYPTO_ANSI_CPRNG=y
87-
CONFIG_PRINTK_TIME=y
88-
CONFIG_DEBUG_INFO=y
89-
CONFIG_DEBUG_INFO_REDUCED=y
90-
# CONFIG_ENABLE_WARN_DEPRECATED is not set
91-
# CONFIG_ENABLE_MUST_CHECK is not set
92-
93-
#
94-
# HID support
95-
#
96-
CONFIG_HID=y
9741
CONFIG_HID_BATTERY_STRENGTH=y
9842
CONFIG_HIDRAW=y
9943
CONFIG_UHID=y
100-
CONFIG_HID_GENERIC=y
101-
#
102-
# Special HID drivers
103-
#
10444
CONFIG_HID_A4TECH=y
10545
CONFIG_HID_ACRUX=y
10646
CONFIG_HID_ACRUX_FF=y
10747
CONFIG_HID_APPLE=y
108-
CONFIG_HID_ASUS=y
10948
CONFIG_HID_AUREAL=y
11049
CONFIG_HID_BELKIN=y
11150
CONFIG_HID_CHERRY=y
112-
CONFIG_HID_CHICONY=y
11351
CONFIG_HID_COUGAR=y
11452
CONFIG_HID_MACALLY=y
11553
CONFIG_HID_CMEDIA=y
@@ -132,14 +70,7 @@ CONFIG_HID_JABRA=y
13270
CONFIG_HID_TWINHAN=y
13371
CONFIG_HID_KENSINGTON=y
13472
CONFIG_HID_LCPOWER=y
135-
CONFIG_HID_LED=y
13673
CONFIG_HID_LENOVO=y
137-
CONFIG_HID_LOGITECH=y
138-
CONFIG_HID_LOGITECH_HIDPP=y
139-
CONFIG_LOGITECH_FF=y
140-
CONFIG_LOGIRUMBLEPAD2_FF=y
141-
CONFIG_LOGIG940_FF=y
142-
CONFIG_LOGIWHEELS_FF=y
14374
CONFIG_HID_MAGICMOUSE=y
14475
CONFIG_HID_MALTRON=y
14576
CONFIG_HID_MAYFLASH=y
@@ -153,16 +84,12 @@ CONFIG_HID_PANTHERLORD=y
15384
CONFIG_PANTHERLORD_FF=y
15485
CONFIG_HID_PETALYNX=y
15586
CONFIG_HID_PICOLCD=y
156-
CONFIG_HID_PICOLCD_BACKLIGHT=y
157-
CONFIG_HID_PICOLCD_LCD=y
15887
CONFIG_HID_PICOLCD_LEDS=y
15988
CONFIG_HID_PLANTRONICS=y
16089
CONFIG_HID_PRIMAX=y
16190
CONFIG_HID_SAITEK=y
162-
CONFIG_HID_SAMSUNG=y
16391
CONFIG_HID_SPEEDLINK=y
16492
CONFIG_HID_STEAM=y
165-
CONFIG_HID_STEELSERIES=y
16693
CONFIG_HID_SUNPLUS=y
16794
CONFIG_HID_RMI=y
16895
CONFIG_HID_GREENASIA=y
@@ -172,8 +99,6 @@ CONFIG_SMARTJOYPLUS_FF=y
17299
CONFIG_HID_TIVO=y
173100
CONFIG_HID_TOPSEED=y
174101
CONFIG_HID_THINGM=y
175-
CONFIG_HID_THRUSTMASTER=y
176-
CONFIG_THRUSTMASTER_FF=y
177102
CONFIG_HID_UDRAW_PS3=y
178103
CONFIG_HID_WIIMOTE=y
179104
CONFIG_HID_XINMO=y
@@ -183,13 +108,62 @@ CONFIG_HID_ZYDACRON=y
183108
CONFIG_HID_SENSOR_HUB=y
184109
CONFIG_HID_SENSOR_CUSTOM_SENSOR=y
185110
CONFIG_HID_ALPS=y
186-
# end of Special HID drivers
187-
# end of HID support
188-
189-
CONFIG_KASAN=y
190-
CONFIG_KASAN_STACK_ENABLE=y
191-
CONFIG_KASAN_GENERIC=y
192-
CONFIG_KASAN_OUTLINE=y
111+
CONFIG_VIRTIO_MMIO=y
112+
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
113+
CONFIG_VHOST_VSOCK=y
114+
# CONFIG_FILE_LOCKING is not set
115+
# CONFIG_DNOTIFY is not set
116+
# CONFIG_INOTIFY_USER is not set
117+
CONFIG_VFAT_FS=y
118+
CONFIG_NLS_CODEPAGE_437=y
119+
CONFIG_NLS_CODEPAGE_737=y
120+
CONFIG_NLS_CODEPAGE_775=y
121+
CONFIG_NLS_CODEPAGE_850=y
122+
CONFIG_NLS_CODEPAGE_852=y
123+
CONFIG_NLS_CODEPAGE_855=y
124+
CONFIG_NLS_CODEPAGE_857=y
125+
CONFIG_NLS_CODEPAGE_860=y
126+
CONFIG_NLS_CODEPAGE_861=y
127+
CONFIG_NLS_CODEPAGE_862=y
128+
CONFIG_NLS_CODEPAGE_863=y
129+
CONFIG_NLS_CODEPAGE_864=y
130+
CONFIG_NLS_CODEPAGE_865=y
131+
CONFIG_NLS_CODEPAGE_866=y
132+
CONFIG_NLS_CODEPAGE_869=y
133+
CONFIG_NLS_CODEPAGE_936=y
134+
CONFIG_NLS_CODEPAGE_950=y
135+
CONFIG_NLS_CODEPAGE_932=y
136+
CONFIG_NLS_CODEPAGE_949=y
137+
CONFIG_NLS_CODEPAGE_874=y
138+
CONFIG_NLS_ISO8859_8=y
139+
CONFIG_NLS_CODEPAGE_1250=y
140+
CONFIG_NLS_CODEPAGE_1251=y
141+
CONFIG_NLS_ASCII=y
142+
CONFIG_NLS_ISO8859_1=y
143+
CONFIG_NLS_ISO8859_2=y
144+
CONFIG_NLS_ISO8859_3=y
145+
CONFIG_NLS_ISO8859_4=y
146+
CONFIG_NLS_ISO8859_5=y
147+
CONFIG_NLS_ISO8859_6=y
148+
CONFIG_NLS_ISO8859_7=y
149+
CONFIG_NLS_ISO8859_9=y
150+
CONFIG_NLS_ISO8859_13=y
151+
CONFIG_NLS_ISO8859_14=y
152+
CONFIG_NLS_ISO8859_15=y
153+
CONFIG_NLS_KOI8_R=y
154+
CONFIG_NLS_KOI8_U=y
155+
CONFIG_NLS_MAC_ROMAN=y
156+
CONFIG_NLS_MAC_CELTIC=y
157+
CONFIG_NLS_MAC_CENTEURO=y
158+
CONFIG_NLS_MAC_CROATIAN=y
159+
CONFIG_NLS_MAC_CYRILLIC=y
160+
CONFIG_NLS_MAC_GAELIC=y
161+
CONFIG_NLS_MAC_GREEK=y
162+
CONFIG_NLS_MAC_ICELAND=y
163+
CONFIG_NLS_MAC_INUIT=y
164+
CONFIG_NLS_MAC_ROMANIAN=y
165+
CONFIG_NLS_MAC_TURKISH=y
166+
CONFIG_NLS_UTF8=y
167+
CONFIG_PRINTK_TIME=y
193168
CONFIG_FRAME_WARN=0
194-
195-
CONFIG_DEVTMPFS=y
169+
CONFIG_KASAN=y

0 commit comments

Comments
 (0)