Skip to content

Commit 1318e22

Browse files
committed
defconfig: squash of defconfig changes
Signed-off-by: Simão Gomes Viana <[email protected]>
1 parent 168da5a commit 1318e22

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

arch/x86/configs/nitrous_defconfig

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CONFIG_LOCALVERSION="-nitrous"
2+
# CONFIG_LOCALVERSION_AUTO is not set
23
CONFIG_KERNEL_ZSTD=y
34
CONFIG_DEFAULT_HOSTNAME="archlinux"
45
CONFIG_SYSVIPC=y
@@ -11,7 +12,7 @@ CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100
1112
CONFIG_BPF_JIT=y
1213
CONFIG_BPF_JIT_ALWAYS_ON=y
1314
CONFIG_BPF_LSM=y
14-
CONFIG_PREEMPT=y
15+
CONFIG_PREEMPT_VOLUNTARY=y
1516
CONFIG_SCHED_CORE=y
1617
CONFIG_IRQ_TIME_ACCOUNTING=y
1718
CONFIG_BSD_PROCESS_ACCT=y
@@ -48,6 +49,7 @@ CONFIG_CGROUP_MISC=y
4849
CONFIG_USER_NS=y
4950
CONFIG_CHECKPOINT_RESTORE=y
5051
CONFIG_SCHED_AUTOGROUP=y
52+
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y
5153
CONFIG_PROFILING=y
5254
CONFIG_KEXEC_FILE=y
5355
CONFIG_KEXEC_SIG=y
@@ -67,6 +69,7 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
6769
CONFIG_JAILHOUSE_GUEST=y
6870
CONFIG_ACRN_GUEST=y
6971
CONFIG_INTEL_TDX_GUEST=y
72+
CONFIG_MSKYLAKEX=y
7073
CONFIG_NR_CPUS=320
7174
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
7275
CONFIG_X86_MCE_INJECT=m
@@ -78,6 +81,7 @@ CONFIG_PERF_EVENTS_AMD_UNCORE=m
7881
CONFIG_PERF_EVENTS_AMD_BRS=y
7982
CONFIG_X86_MSR=y
8083
CONFIG_X86_CPUID=y
84+
# CONFIG_X86_5LEVEL is not set
8185
CONFIG_X86_CPA_STATISTICS=y
8286
CONFIG_AMD_MEM_ENCRYPT=y
8387
CONFIG_NUMA=y
@@ -151,12 +155,13 @@ CONFIG_CPU_IDLE_GOV_TEO=y
151155
CONFIG_HALTPOLL_CPUIDLE=m
152156
CONFIG_INTEL_IDLE=y
153157
CONFIG_IA32_EMULATION=y
154-
CONFIG_KVM=m
155-
CONFIG_KVM_INTEL=m
158+
CONFIG_KVM=y
159+
CONFIG_KVM_INTEL=y
156160
CONFIG_X86_SGX_KVM=y
157-
CONFIG_KVM_AMD=m
161+
CONFIG_KVM_AMD=y
158162
CONFIG_KVM_XEN=y
159163
CONFIG_KPROBES=y
164+
CONFIG_LTO_CLANG_THIN=y
160165
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
161166
CONFIG_LOCK_EVENT_COUNTS=y
162167
CONFIG_MODULES=y
@@ -886,7 +891,7 @@ CONFIG_BLK_DEV_RBD=m
886891
CONFIG_BLK_DEV_UBLK=m
887892
CONFIG_BLK_DEV_RNBD_CLIENT=m
888893
CONFIG_BLK_DEV_RNBD_SERVER=m
889-
CONFIG_BLK_DEV_NVME=m
894+
CONFIG_BLK_DEV_NVME=y
890895
CONFIG_NVME_MULTIPATH=y
891896
CONFIG_NVME_VERBOSE_ERRORS=y
892897
CONFIG_NVME_HWMON=y
@@ -4008,6 +4013,7 @@ CONFIG_USB_LED_TRIG=y
40084013
CONFIG_USB_CONN_GPIO=m
40094014
CONFIG_USB=y
40104015
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
4016+
CONFIG_USB_FEW_INIT_RETRIES=y
40114017
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
40124018
CONFIG_USB_MON=m
40134019
CONFIG_USB_C67X00_HCD=m
@@ -5241,6 +5247,8 @@ CONFIG_MCB_PCI=m
52415247
CONFIG_MCB_LPC=m
52425248
CONFIG_RAS_CEC=y
52435249
CONFIG_USB4=m
5250+
CONFIG_ANDROID_BINDER_IPC=y
5251+
CONFIG_ANDROID_BINDERFS=y
52445252
CONFIG_LIBNVDIMM=y
52455253
CONFIG_BLK_DEV_PMEM=m
52465254
CONFIG_DEV_DAX=m
@@ -5329,6 +5337,10 @@ CONFIG_F2FS_FS_COMPRESSION=y
53295337
CONFIG_F2FS_UNFAIR_RWSEM=y
53305338
CONFIG_ZONEFS_FS=m
53315339
CONFIG_FS_DAX=y
5340+
CONFIG_FS_SYSCTL_PROTECTED_SYMLINKS=y
5341+
CONFIG_FS_SYSCTL_PROTECTED_HARDLINKS=y
5342+
CONFIG_FS_SYSCTL_PROTECTED_FIFOS=2
5343+
CONFIG_FS_SYSCTL_PROTECTED_REGULAR=2
53325344
CONFIG_FS_ENCRYPTION=y
53335345
CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
53345346
CONFIG_FS_VERITY=y
@@ -5624,6 +5636,7 @@ CONFIG_CRC4=m
56245636
CONFIG_DMA_CMA=y
56255637
CONFIG_FONTS=y
56265638
CONFIG_FONT_TER16x32=y
5639+
CONFIG_KPTR_RESTRICT=1
56275640
CONFIG_PRINTK_TIME=y
56285641
CONFIG_STACKTRACE_BUILD_ID=y
56295642
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4

0 commit comments

Comments
 (0)