Skip to content

Commit 8129093

Browse files
author
Ingo Molnar
committed
x86/defconfig: Refresh the defconfigs
Just go through a 'make savedefconfig' cycle to pick up fresh Kconfig details, no change in settings, just reordering of some entries. ( This makes followup changes generated via 'make savedefconfig' contain less noise. ) Signed-off-by: Ingo Molnar <[email protected]>
1 parent 1043897 commit 8129093

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

arch/x86/configs/i386_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ CONFIG_CGROUP_MISC=y
2727
CONFIG_CGROUP_DEBUG=y
2828
CONFIG_BLK_DEV_INITRD=y
2929
CONFIG_KALLSYMS_ALL=y
30-
# CONFIG_COMPAT_BRK is not set
3130
CONFIG_PROFILING=y
3231
CONFIG_SMP=y
3332
CONFIG_HYPERVISOR_GUEST=y
@@ -44,6 +43,7 @@ CONFIG_EFI_STUB=y
4443
CONFIG_HZ_1000=y
4544
CONFIG_KEXEC=y
4645
CONFIG_CRASH_DUMP=y
46+
# CONFIG_RETHUNK is not set
4747
CONFIG_HIBERNATION=y
4848
CONFIG_PM_DEBUG=y
4949
CONFIG_PM_TRACE_RTC=y
@@ -62,6 +62,7 @@ CONFIG_BLK_CGROUP_IOLATENCY=y
6262
CONFIG_BLK_CGROUP_IOCOST=y
6363
CONFIG_BLK_CGROUP_IOPRIO=y
6464
CONFIG_BINFMT_MISC=y
65+
# CONFIG_COMPAT_BRK is not set
6566
CONFIG_NET=y
6667
CONFIG_PACKET=y
6768
CONFIG_UNIX=y
@@ -269,9 +270,9 @@ CONFIG_SECURITY_SELINUX=y
269270
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
270271
CONFIG_SECURITY_SELINUX_DISABLE=y
271272
CONFIG_PRINTK_TIME=y
273+
CONFIG_DEBUG_KERNEL=y
272274
CONFIG_FRAME_WARN=1024
273275
CONFIG_MAGIC_SYSRQ=y
274-
CONFIG_DEBUG_KERNEL=y
275276
CONFIG_DEBUG_STACK_USAGE=y
276277
# CONFIG_SCHED_DEBUG is not set
277278
CONFIG_SCHEDSTATS=y

arch/x86/configs/x86_64_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ CONFIG_CGROUP_MISC=y
2626
CONFIG_CGROUP_DEBUG=y
2727
CONFIG_BLK_DEV_INITRD=y
2828
CONFIG_KALLSYMS_ALL=y
29-
# CONFIG_COMPAT_BRK is not set
3029
CONFIG_PROFILING=y
3130
CONFIG_SMP=y
3231
CONFIG_HYPERVISOR_GUEST=y
@@ -62,6 +61,7 @@ CONFIG_BLK_CGROUP_IOLATENCY=y
6261
CONFIG_BLK_CGROUP_IOCOST=y
6362
CONFIG_BLK_CGROUP_IOPRIO=y
6463
CONFIG_BINFMT_MISC=y
64+
# CONFIG_COMPAT_BRK is not set
6565
CONFIG_NET=y
6666
CONFIG_PACKET=y
6767
CONFIG_UNIX=y
@@ -267,8 +267,8 @@ CONFIG_SECURITY_SELINUX=y
267267
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
268268
CONFIG_SECURITY_SELINUX_DISABLE=y
269269
CONFIG_PRINTK_TIME=y
270-
CONFIG_MAGIC_SYSRQ=y
271270
CONFIG_DEBUG_KERNEL=y
271+
CONFIG_MAGIC_SYSRQ=y
272272
CONFIG_DEBUG_STACK_USAGE=y
273273
# CONFIG_SCHED_DEBUG is not set
274274
CONFIG_SCHEDSTATS=y

0 commit comments

Comments
 (0)