Skip to content

Commit 1d0e12f

Browse files
author
Ingo Molnar
committed
x86/defconfigs: Refresh defconfig files
Perform a 'make savedefconfig' pass over our main defconfig files, which keeps the defconfig result the same, but compresses the file where defaults were changed, options removed or reordered. Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 587af64 commit 1d0e12f

File tree

2 files changed

+62
-122
lines changed

2 files changed

+62
-122
lines changed

arch/x86/configs/i386_defconfig

Lines changed: 31 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,55 @@
1-
# CONFIG_64BIT is not set
21
# CONFIG_LOCALVERSION_AUTO is not set
32
CONFIG_SYSVIPC=y
43
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_AUDIT=y
5+
CONFIG_NO_HZ=y
6+
CONFIG_HIGH_RES_TIMERS=y
7+
CONFIG_PREEMPT_VOLUNTARY=y
58
CONFIG_BSD_PROCESS_ACCT=y
69
CONFIG_TASKSTATS=y
710
CONFIG_TASK_DELAY_ACCT=y
811
CONFIG_TASK_XACCT=y
912
CONFIG_TASK_IO_ACCOUNTING=y
10-
CONFIG_FHANDLE=y
11-
CONFIG_AUDIT=y
12-
CONFIG_NO_HZ=y
13-
CONFIG_HIGH_RES_TIMERS=y
1413
CONFIG_LOG_BUF_SHIFT=18
1514
CONFIG_CGROUPS=y
15+
CONFIG_CGROUP_SCHED=y
1616
CONFIG_CGROUP_FREEZER=y
1717
CONFIG_CPUSETS=y
1818
CONFIG_CGROUP_CPUACCT=y
19-
CONFIG_CGROUP_SCHED=y
2019
CONFIG_BLK_DEV_INITRD=y
2120
# CONFIG_COMPAT_BRK is not set
2221
CONFIG_PROFILING=y
23-
CONFIG_KPROBES=y
24-
CONFIG_JUMP_LABEL=y
25-
CONFIG_MODULES=y
26-
CONFIG_MODULE_UNLOAD=y
27-
CONFIG_MODULE_FORCE_UNLOAD=y
2822
CONFIG_SMP=y
2923
CONFIG_X86_GENERIC=y
3024
CONFIG_HPET_TIMER=y
31-
CONFIG_SCHED_SMT=y
32-
CONFIG_PREEMPT_VOLUNTARY=y
3325
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
34-
CONFIG_X86_MCE=y
3526
CONFIG_X86_REBOOTFIXUPS=y
36-
CONFIG_MICROCODE=y
3727
CONFIG_MICROCODE_AMD=y
3828
CONFIG_X86_MSR=y
3929
CONFIG_X86_CPUID=y
4030
CONFIG_HIGHPTE=y
4131
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
4232
# CONFIG_MTRR_SANITIZER is not set
4333
CONFIG_EFI=y
34+
CONFIG_EFI_STUB=y
4435
CONFIG_HZ_1000=y
4536
CONFIG_KEXEC=y
4637
CONFIG_CRASH_DUMP=y
47-
CONFIG_RANDOMIZE_BASE=y
48-
CONFIG_RANDOMIZE_MEMORY=y
49-
# CONFIG_COMPAT_VDSO is not set
5038
CONFIG_HIBERNATION=y
5139
CONFIG_PM_DEBUG=y
5240
CONFIG_PM_TRACE_RTC=y
5341
CONFIG_ACPI_DOCK=y
54-
CONFIG_CPU_FREQ=y
55-
# CONFIG_CPU_FREQ_STAT is not set
42+
CONFIG_ACPI_BGRT=y
5643
CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
57-
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
5844
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
5945
CONFIG_X86_ACPI_CPUFREQ=y
60-
CONFIG_PCI=y
61-
CONFIG_PCIEPORTBUS=y
62-
CONFIG_PCI_MSI=y
63-
CONFIG_PCCARD=y
64-
CONFIG_YENTA=y
65-
CONFIG_HOTPLUG_PCI=y
46+
CONFIG_EFI_VARS=y
47+
CONFIG_KPROBES=y
48+
CONFIG_JUMP_LABEL=y
49+
CONFIG_MODULES=y
50+
CONFIG_MODULE_UNLOAD=y
51+
CONFIG_MODULE_FORCE_UNLOAD=y
52+
# CONFIG_UNUSED_SYMBOLS is not set
6653
CONFIG_BINFMT_MISC=y
6754
CONFIG_NET=y
6855
CONFIG_PACKET=y
@@ -82,16 +69,12 @@ CONFIG_IP_MROUTE=y
8269
CONFIG_IP_PIMSM_V1=y
8370
CONFIG_IP_PIMSM_V2=y
8471
CONFIG_SYN_COOKIES=y
85-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
86-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
87-
# CONFIG_INET_XFRM_MODE_BEET is not set
8872
# CONFIG_INET_DIAG is not set
8973
CONFIG_TCP_CONG_ADVANCED=y
9074
# CONFIG_TCP_CONG_BIC is not set
9175
# CONFIG_TCP_CONG_WESTWOOD is not set
9276
# CONFIG_TCP_CONG_HTCP is not set
9377
CONFIG_TCP_MD5SIG=y
94-
CONFIG_IPV6=y
9578
CONFIG_INET6_AH=y
9679
CONFIG_INET6_ESP=y
9780
CONFIG_NETLABEL=y
@@ -102,21 +85,19 @@ CONFIG_NF_CONNTRACK_FTP=y
10285
CONFIG_NF_CONNTRACK_IRC=y
10386
CONFIG_NF_CONNTRACK_SIP=y
10487
CONFIG_NF_CT_NETLINK=y
88+
CONFIG_NF_NAT=y
10589
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
10690
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
10791
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
10892
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
10993
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
11094
CONFIG_NETFILTER_XT_MATCH_POLICY=y
11195
CONFIG_NETFILTER_XT_MATCH_STATE=y
112-
CONFIG_NF_CONNTRACK_IPV4=y
11396
CONFIG_IP_NF_IPTABLES=y
11497
CONFIG_IP_NF_FILTER=y
11598
CONFIG_IP_NF_TARGET_REJECT=y
116-
CONFIG_NF_NAT=y
117-
CONFIG_IP_NF_TARGET_MASQUERADE=y
99+
CONFIG_IP_NF_TARGET_MASQUERADE=m
118100
CONFIG_IP_NF_MANGLE=y
119-
CONFIG_NF_CONNTRACK_IPV6=y
120101
CONFIG_IP6_NF_IPTABLES=y
121102
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
122103
CONFIG_IP6_NF_FILTER=y
@@ -129,6 +110,12 @@ CONFIG_CFG80211=y
129110
CONFIG_MAC80211=y
130111
CONFIG_MAC80211_LEDS=y
131112
CONFIG_RFKILL=y
113+
CONFIG_PCI=y
114+
CONFIG_PCIEPORTBUS=y
115+
CONFIG_PCI_MSI=y
116+
CONFIG_HOTPLUG_PCI=y
117+
CONFIG_PCCARD=y
118+
CONFIG_YENTA=y
132119
CONFIG_DEVTMPFS=y
133120
CONFIG_DEVTMPFS_MOUNT=y
134121
CONFIG_DEBUG_DEVRES=y
@@ -170,15 +157,12 @@ CONFIG_8139TOO=y
170157
# CONFIG_8139TOO_PIO is not set
171158
CONFIG_R8169=y
172159
CONFIG_INPUT_POLLDEV=y
173-
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
174160
CONFIG_INPUT_EVDEV=y
175161
CONFIG_INPUT_JOYSTICK=y
176162
CONFIG_INPUT_TABLET=y
177163
CONFIG_INPUT_TOUCHSCREEN=y
178164
CONFIG_INPUT_MISC=y
179-
CONFIG_VT_HW_CONSOLE_BINDING=y
180165
# CONFIG_LEGACY_PTYS is not set
181-
CONFIG_SERIAL_NONSTANDARD=y
182166
CONFIG_SERIAL_8250=y
183167
CONFIG_SERIAL_8250_CONSOLE=y
184168
CONFIG_SERIAL_8250_NR_UARTS=32
@@ -187,6 +171,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
187171
CONFIG_SERIAL_8250_SHARE_IRQ=y
188172
CONFIG_SERIAL_8250_DETECT_IRQ=y
189173
CONFIG_SERIAL_8250_RSA=y
174+
CONFIG_SERIAL_NONSTANDARD=y
190175
CONFIG_HW_RANDOM=y
191176
CONFIG_NVRAM=y
192177
CONFIG_HPET=y
@@ -201,19 +186,15 @@ CONFIG_DRM_I915=y
201186
CONFIG_FB_MODE_HELPERS=y
202187
CONFIG_FB_TILEBLITTING=y
203188
CONFIG_FB_EFI=y
204-
# CONFIG_LCD_CLASS_DEVICE is not set
205189
CONFIG_VGACON_SOFT_SCROLLBACK=y
206190
CONFIG_LOGO=y
207191
# CONFIG_LOGO_LINUX_MONO is not set
208192
# CONFIG_LOGO_LINUX_VGA16 is not set
209193
CONFIG_SOUND=y
210194
CONFIG_SND=y
195+
CONFIG_SND_HRTIMER=y
211196
CONFIG_SND_SEQUENCER=y
212197
CONFIG_SND_SEQ_DUMMY=y
213-
CONFIG_SND_MIXER_OSS=y
214-
CONFIG_SND_PCM_OSS=y
215-
CONFIG_SND_SEQUENCER_OSS=y
216-
CONFIG_SND_HRTIMER=y
217198
CONFIG_SND_HDA_INTEL=y
218199
CONFIG_SND_HDA_HWDEP=y
219200
CONFIG_HIDRAW=y
@@ -234,17 +215,14 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
234215
CONFIG_USB_MON=y
235216
CONFIG_USB_XHCI_HCD=y
236217
CONFIG_USB_EHCI_HCD=y
237-
CONFIG_USB_EHCI_TT_NEWSCHED=y
238218
CONFIG_USB_OHCI_HCD=y
239219
CONFIG_USB_UHCI_HCD=y
240220
CONFIG_USB_PRINTER=y
241221
CONFIG_USB_STORAGE=y
242-
CONFIG_EDAC=y
243222
CONFIG_RTC_CLASS=y
244223
# CONFIG_RTC_HCTOSYS is not set
245224
CONFIG_DMADEVICES=y
246225
CONFIG_EEEPC_LAPTOP=y
247-
CONFIG_EFI_VARS=y
248226
CONFIG_EXT4_FS=y
249227
CONFIG_EXT4_FS_POSIX_ACL=y
250228
CONFIG_EXT4_FS_SECURITY=y
@@ -270,26 +248,19 @@ CONFIG_NLS_CODEPAGE_437=y
270248
CONFIG_NLS_ASCII=y
271249
CONFIG_NLS_ISO8859_1=y
272250
CONFIG_NLS_UTF8=y
251+
CONFIG_SECURITY=y
252+
CONFIG_SECURITY_NETWORK=y
253+
CONFIG_SECURITY_SELINUX=y
254+
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
255+
CONFIG_SECURITY_SELINUX_DISABLE=y
273256
CONFIG_PRINTK_TIME=y
274-
CONFIG_FRAME_WARN=1024
275257
CONFIG_MAGIC_SYSRQ=y
276-
# CONFIG_UNUSED_SYMBOLS is not set
277258
CONFIG_DEBUG_KERNEL=y
259+
CONFIG_DEBUG_STACK_USAGE=y
260+
CONFIG_DEBUG_STACKOVERFLOW=y
278261
# CONFIG_SCHED_DEBUG is not set
279262
CONFIG_SCHEDSTATS=y
280-
CONFIG_TIMER_STATS=y
281-
CONFIG_DEBUG_STACK_USAGE=y
282263
CONFIG_BLK_DEV_IO_TRACE=y
283264
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
284265
CONFIG_EARLY_PRINTK_DBGP=y
285-
CONFIG_DEBUG_STACKOVERFLOW=y
286-
# CONFIG_DEBUG_RODATA_TEST is not set
287266
CONFIG_DEBUG_BOOT_PARAMS=y
288-
CONFIG_SECURITY=y
289-
CONFIG_SECURITY_NETWORK=y
290-
CONFIG_SECURITY_SELINUX=y
291-
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
292-
CONFIG_SECURITY_SELINUX_DISABLE=y
293-
# CONFIG_CRYPTO_ANSI_CPRNG is not set
294-
CONFIG_EFI_STUB=y
295-
CONFIG_ACPI_BGRT=y

0 commit comments

Comments
 (0)