Skip to content

Commit e12ac84

Browse files
committed
Merge tag 'x86-kconfig-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kconfig updates from Ingo Molnar: - Emit standard build success messages in insn_sanity.c and insn_decoder_test.c (Ingo Molnar) - Refresh the x86-[64|32] defconfigs mechanically (Ingo Molnar) * tag 'x86-kconfig-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/tools: insn_sanity.c: Emit standard build success messages x86/tools: insn_decoder_test.c: Emit standard build success messages x86/kconfig/32: Refresh defconfig x86/kconfig/64: Refresh defconfig
2 parents 0c23929 + 9df5e79 commit e12ac84

File tree

4 files changed

+7
-27
lines changed

4 files changed

+7
-27
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

arch/x86/configs/x86_64_defconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ CONFIG_CGROUP_DEBUG=y
2727
CONFIG_BLK_DEV_INITRD=y
2828
CONFIG_KALLSYMS_ALL=y
2929
CONFIG_PROFILING=y
30+
CONFIG_KEXEC=y
3031
CONFIG_SMP=y
3132
CONFIG_HYPERVISOR_GUEST=y
3233
CONFIG_PARAVIRT=y
@@ -40,8 +41,6 @@ CONFIG_EFI=y
4041
CONFIG_EFI_STUB=y
4142
CONFIG_EFI_MIXED=y
4243
CONFIG_HZ_1000=y
43-
CONFIG_KEXEC=y
44-
CONFIG_CRASH_DUMP=y
4544
CONFIG_HIBERNATION=y
4645
CONFIG_PM_DEBUG=y
4746
CONFIG_PM_TRACE_RTC=y
@@ -63,9 +62,7 @@ CONFIG_BINFMT_MISC=y
6362
# CONFIG_COMPAT_BRK is not set
6463
CONFIG_NET=y
6564
CONFIG_PACKET=y
66-
CONFIG_UNIX=y
6765
CONFIG_XFRM_USER=y
68-
CONFIG_INET=y
6966
CONFIG_IP_MULTICAST=y
7067
CONFIG_IP_ADVANCED_ROUTER=y
7168
CONFIG_IP_MULTIPLE_TABLES=y
@@ -205,7 +202,6 @@ CONFIG_SND_HDA_INTEL=y
205202
CONFIG_SND_HDA_HWDEP=y
206203
CONFIG_HIDRAW=y
207204
CONFIG_HID_GYRATION=y
208-
CONFIG_LOGITECH_FF=y
209205
CONFIG_HID_NTRIG=y
210206
CONFIG_HID_PANTHERLORD=y
211207
CONFIG_PANTHERLORD_FF=y
@@ -239,7 +235,6 @@ CONFIG_EXT4_FS_POSIX_ACL=y
239235
CONFIG_EXT4_FS_SECURITY=y
240236
CONFIG_QUOTA=y
241237
CONFIG_QUOTA_NETLINK_INTERFACE=y
242-
# CONFIG_PRINT_QUOTA_WARNING is not set
243238
CONFIG_QFMT_V2=y
244239
CONFIG_AUTOFS_FS=y
245240
CONFIG_ISO9660_FS=y
@@ -264,13 +259,11 @@ CONFIG_SECURITY=y
264259
CONFIG_SECURITY_NETWORK=y
265260
CONFIG_SECURITY_SELINUX=y
266261
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
267-
CONFIG_SECURITY_SELINUX_DISABLE=y
268262
CONFIG_PRINTK_TIME=y
269263
CONFIG_DEBUG_KERNEL=y
270264
CONFIG_MAGIC_SYSRQ=y
271265
CONFIG_DEBUG_WX=y
272266
CONFIG_DEBUG_STACK_USAGE=y
273-
# CONFIG_SCHED_DEBUG is not set
274267
CONFIG_SCHEDSTATS=y
275268
CONFIG_BLK_DEV_IO_TRACE=y
276269
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y

arch/x86/tools/insn_decoder_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ int main(int argc, char **argv)
167167
pr_warn("Decoded and checked %d instructions with %d "
168168
"failures\n", insns, warnings);
169169
else
170-
fprintf(stdout, "%s: success: Decoded and checked %d"
170+
fprintf(stdout, " %s: success: Decoded and checked %d"
171171
" instructions\n", prog, insns);
172172
return 0;
173173
}

arch/x86/tools/insn_sanity.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ int main(int argc, char **argv)
253253
}
254254

255255
fprintf((errors) ? stderr : stdout,
256-
"%s: %s: decoded and checked %d %s instructions with %d errors (seed:0x%x)\n",
256+
" %s: %s: Decoded and checked %d %s instructions with %d errors (seed:0x%x)\n",
257257
prog,
258-
(errors) ? "Failure" : "Success",
258+
(errors) ? "failure" : "success",
259259
insns,
260260
(input_file) ? "given" : "random",
261261
errors,

0 commit comments

Comments
 (0)