Skip to content

Commit 6453e7c

Browse files
Ingo Molnarbp3tk0v
authored andcommitted
x86/kconfig/32: Refresh defconfig
Refresh the x86-32 defconfig to pick up changes in the general Kconfig environment: removed options, different defaults, renames, etc. No changes to the actual result of 'make ARCH=i386 defconfig'. [ bp: Fold in a fix as reported by Andy: https://lore.kernel.org/r/[email protected] ] Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: David Woodhouse <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Jürgen Groß <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Michal Marek <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Vitaly Kuznetsov <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 00c7a87 commit 6453e7c

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

arch/x86/configs/i386_defconfig

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ CONFIG_CGROUP_DEBUG=y
2727
CONFIG_BLK_DEV_INITRD=y
2828
CONFIG_KALLSYMS_ALL=y
2929
CONFIG_PROFILING=y
30+
CONFIG_KEXEC=y
31+
# Do not remove this as it results in non-bootable kernels
32+
# CONFIG_64BIT is not set
3033
CONFIG_SMP=y
3134
CONFIG_HYPERVISOR_GUEST=y
3235
CONFIG_PARAVIRT=y
33-
CONFIG_NR_CPUS=8
3436
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
3537
CONFIG_X86_MSR=y
3638
CONFIG_X86_CPUID=y
@@ -39,9 +41,6 @@ CONFIG_X86_CHECK_BIOS_CORRUPTION=y
3941
CONFIG_EFI=y
4042
CONFIG_EFI_STUB=y
4143
CONFIG_HZ_1000=y
42-
CONFIG_KEXEC=y
43-
CONFIG_CRASH_DUMP=y
44-
# CONFIG_MITIGATION_RETHUNK is not set
4544
CONFIG_HIBERNATION=y
4645
CONFIG_PM_DEBUG=y
4746
CONFIG_PM_TRACE_RTC=y
@@ -52,7 +51,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
5251
CONFIG_X86_ACPI_CPUFREQ=y
5352
CONFIG_KPROBES=y
5453
CONFIG_JUMP_LABEL=y
55-
CONFIG_COMPAT_32BIT_TIME=y
5654
CONFIG_MODULES=y
5755
CONFIG_MODULE_UNLOAD=y
5856
CONFIG_MODULE_FORCE_UNLOAD=y
@@ -63,9 +61,7 @@ CONFIG_BINFMT_MISC=y
6361
# CONFIG_COMPAT_BRK is not set
6462
CONFIG_NET=y
6563
CONFIG_PACKET=y
66-
CONFIG_UNIX=y
6764
CONFIG_XFRM_USER=y
68-
CONFIG_INET=y
6965
CONFIG_IP_MULTICAST=y
7066
CONFIG_IP_ADVANCED_ROUTER=y
7167
CONFIG_IP_MULTIPLE_TABLES=y
@@ -134,7 +130,6 @@ CONFIG_DEVTMPFS=y
134130
CONFIG_DEVTMPFS_MOUNT=y
135131
CONFIG_DEBUG_DEVRES=y
136132
CONFIG_CONNECTOR=y
137-
CONFIG_EFI_CAPSULE_LOADER=y
138133
CONFIG_BLK_DEV_LOOP=y
139134
CONFIG_VIRTIO_BLK=y
140135
CONFIG_BLK_DEV_SD=y
@@ -210,7 +205,6 @@ CONFIG_SND_HDA_INTEL=y
210205
CONFIG_SND_HDA_HWDEP=y
211206
CONFIG_HIDRAW=y
212207
CONFIG_HID_GYRATION=y
213-
CONFIG_LOGITECH_FF=y
214208
CONFIG_HID_NTRIG=y
215209
CONFIG_HID_PANTHERLORD=y
216210
CONFIG_PANTHERLORD_FF=y
@@ -241,7 +235,6 @@ CONFIG_EXT4_FS_POSIX_ACL=y
241235
CONFIG_EXT4_FS_SECURITY=y
242236
CONFIG_QUOTA=y
243237
CONFIG_QUOTA_NETLINK_INTERFACE=y
244-
# CONFIG_PRINT_QUOTA_WARNING is not set
245238
CONFIG_QFMT_V2=y
246239
CONFIG_AUTOFS_FS=y
247240
CONFIG_ISO9660_FS=y
@@ -266,19 +259,13 @@ CONFIG_SECURITY=y
266259
CONFIG_SECURITY_NETWORK=y
267260
CONFIG_SECURITY_SELINUX=y
268261
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
269-
CONFIG_SECURITY_SELINUX_DISABLE=y
270262
CONFIG_PRINTK_TIME=y
271263
CONFIG_DEBUG_KERNEL=y
272-
CONFIG_FRAME_WARN=1024
273264
CONFIG_MAGIC_SYSRQ=y
274-
CONFIG_DEBUG_WX=y
275265
CONFIG_DEBUG_STACK_USAGE=y
276-
# CONFIG_SCHED_DEBUG is not set
277266
CONFIG_SCHEDSTATS=y
278267
CONFIG_BLK_DEV_IO_TRACE=y
279268
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
280269
CONFIG_EARLY_PRINTK_DBGP=y
281270
CONFIG_DEBUG_BOOT_PARAMS=y
282-
CONFIG_UNWINDER_FRAME_POINTER=y
283271
CONFIG_DEBUG_ENTRY=y
284-
# CONFIG_64BIT is not set

0 commit comments

Comments
 (0)