defconfig: turn off KVM support because the CPU lacks virtualization …

…support

arch/arm64/configs/merge_kirin970_defconfig

@@ -154,11 +154,7 @@ CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_BPF=y
 CONFIG_SOCK_CGROUP_DATA=y
 # CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-# CONFIG_USER_NS is not set
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
+# CONFIG_NAMESPACES is not set
 CONFIG_HISI_EAS_SCHED=y
 CONFIG_HISI_MULTI_MARGIN=y
 CONFIG_HISI_RT_OPT=y
@@ -168,7 +164,7 @@ CONFIG_HISI_ED_TASK=y
 # CONFIG_HISI_ED_TASK_RESET_AT_UPMIGRATION is not set
 # CONFIG_HISI_CPU_ISOLATION is not set
 # CONFIG_HISI_MIGRATION_NOTIFY is not set
-# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_TUNE=y
 CONFIG_DYNAMIC_STUNE_BOOST=y
 CONFIG_DEFAULT_USE_ENERGY_AWARE=y
@@ -182,7 +178,7 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
-CONFIG_RD_LZ4=y
+# CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -368,7 +364,6 @@ CONFIG_DEFAULT_ROW=y
 CONFIG_ROW_OPTIMIZATION=y
 # CONFIG_ROW_VIP_QUEUE is not set
 CONFIG_DEFAULT_IOSCHED="row"
-CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
@@ -480,7 +475,6 @@ CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 # CONFIG_ARM64_ERRATUM_832075 is not set
-CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 # CONFIG_ARM64_ERRATUM_1024718 is not set
@@ -538,13 +532,10 @@ CONFIG_NO_BOOTMEM=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
-CONFIG_MMU_NOTIFIER=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
@@ -587,7 +578,7 @@ CONFIG_SECCOMP=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_UNMAP_KERNEL_AT_EL0 is not set
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
-# CONFIG_HISI_HARDEN_BRANCH_PREDICTOR is not set
+CONFIG_HISI_HARDEN_BRANCH_PREDICTOR=y
 # CONFIG_ARM64_SSBD is not set
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
@@ -599,14 +590,14 @@ CONFIG_ARM64_SW_TTBR0_PAN=y
 # ARMv8.1 architectural features
 #
 # CONFIG_ARM64_HW_AFDBM is not set
-CONFIG_ARM64_PAN=y
+# CONFIG_ARM64_PAN is not set
 # CONFIG_ARM64_LSE_ATOMICS is not set
-CONFIG_ARM64_VHE=y
+# CONFIG_ARM64_VHE is not set
 
 #
 # ARMv8.2 architectural features
 #
-CONFIG_ARM64_UAO=y
+# CONFIG_ARM64_UAO is not set
 CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_RELOCATABLE=y
@@ -734,7 +725,7 @@ CONFIG_HISI_L2_DYNAMIC_RETENTION=y
 CONFIG_HISI_CPUDDR_FREQ_LINK=y
 CONFIG_CPU_FREQ_POWER_STAT=y
 CONFIG_HISI_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_HISI_CPU_FREQ_LOCK_DETECT=y
+# CONFIG_HISI_CPU_FREQ_LOCK_DETECT is not set
 CONFIG_HISI_CPUFREQ_LOWTEMP=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -757,7 +748,7 @@ CONFIG_XFRM_IPCOMP=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
-CONFIG_WIREGUARD=m
+CONFIG_WIREGUARD=y
 # CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -772,7 +763,7 @@ CONFIG_NET_IP_TUNNEL=y
 # CONFIG_IP_MROUTE is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=y
-CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_UDP_TUNNEL=y
 # CONFIG_NET_FOU is not set
 # CONFIG_NET_FOU_IP_TUNNELS is not set
 CONFIG_INET_AH=y
@@ -1198,9 +1189,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
-CONFIG_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
+# CONFIG_VSOCKETS is not set
 # CONFIG_NETLINK_DIAG is not set
 # CONFIG_MPLS is not set
 # CONFIG_HSR is not set
@@ -1473,7 +1462,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-CONFIG_VIRTIO_BLK=m
+# CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 # CONFIG_BLK_DEV_NVME is not set
@@ -1647,7 +1636,7 @@ CONFIG_SCSI_UFS_INLINE_CRYPTO=y
 CONFIG_SCSI_UFS_ENHANCED_INLINE_CRYPTO=y
 # CONFIG_SCSI_UFS_ENHANCED_INLINE_CRYPTO_V2 is not set
 CONFIG_SCSI_UFS_HS_ERROR_RECOVER=y
-CONFIG_HUAWEI_UFS_DSM=y
+# CONFIG_HUAWEI_UFS_DSM is not set
 CONFIG_SCSI_UFS_HI1861_VCMD=y
 CONFIG_HISI_UFS_MANUAL_BKOPS=y
 CONFIG_HUAWEI_UFS_VENDOR_MODE=y
@@ -1735,7 +1724,7 @@ CONFIG_DUMMY=y
 CONFIG_TUN=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
 # CONFIG_VETH is not set
-CONFIG_VIRTIO_NET=m
+# CONFIG_VIRTIO_NET is not set
 # CONFIG_NLMON is not set
 # CONFIG_ARCNET is not set
 
@@ -3765,8 +3754,8 @@ CONFIG_HISI_MMC_SECURE_RPMB=y
 CONFIG_HISI_MMC_FLUSH_REDUCE=y
 # CONFIG_HISI_MMC_FLUSH_REDUCE_WHITE_LIST is not set
 # CONFIG_HISI_MMC_MANUAL_BKOPS is not set
-CONFIG_HUAWEI_SDCARD_DSM=y
-CONFIG_HUAWEI_EMMC_DSM=y
+# CONFIG_HUAWEI_SDCARD_DSM is not set
+# CONFIG_HUAWEI_EMMC_DSM is not set
 # CONFIG_HUAWEI_EMMC_DSM_ONLY_VDET is not set
 CONFIG_PWRSEQ_EMMC=y
 CONFIG_PWRSEQ_SIMPLE=y
@@ -4033,15 +4022,15 @@ CONFIG_SW_SYNC=y
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_VFIO is not set
-CONFIG_VIRT_DRIVERS=y
+# CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO=y
 
 #
 # Virtio drivers
 #
 # CONFIG_VIRTIO_PCI is not set
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_INPUT is not set
 # CONFIG_VIRTIO_MMIO is not set
 
 #
@@ -4852,7 +4841,7 @@ CONFIG_HW_GET_P2P_TX_RATE=y
 CONFIG_HWGPS=y
 CONFIG_HUAWEI_HW_DEV_DCT=y
 # CONFIG_HUAWEI_DEV_SELFCHECK is not set
-CONFIG_HUAWEI_IO_TRACING=y
+# CONFIG_HUAWEI_IO_TRACING is not set
 # CONFIG_VIACBP82D_3RD_MODEM is not set
 # CONFIG_INPUTHUB is not set
 CONFIG_INPUTHUB_20=y
@@ -5190,7 +5179,7 @@ CONFIG_HUAWEI_DUBAI_TASK_CPU_POWER=y
 CONFIG_HW_CPULOAD_NOTI=y
 # CONFIG_HW_MEMORY_MONITOR is not set
 CONFIG_HUAWEI_CFI_TAG=0x0035c000
-# CONFIG_HUAWEI_CFI is not set
+CONFIG_HUAWEI_CFI=y
 # CONFIG_HUAWEI_CFI_DEBUG is not set
 CONFIG_HUAWEI_STORAGE_ROFA=y
 CONFIG_HUAWEI_STORAGE_ROCHK=y
@@ -5451,25 +5440,9 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_MAC_TURKISH is not set
 CONFIG_NLS_UTF8=y
 # CONFIG_DLM is not set
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_COMPAT=y
 CONFIG_VIRTUALIZATION=y
-CONFIG_KVM_ARM_VGIC_V3_ITS=y
-CONFIG_KVM=y
-CONFIG_KVM_ARM_HOST=y
-CONFIG_KVM_ARM_PMU=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST=m
+# CONFIG_KVM is not set
+# CONFIG_VHOST_NET is not set
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
@@ -5731,7 +5704,8 @@ CONFIG_DEFAULT_SECURITY="selinux"
 # CONFIG_HUAWEI_KERNEL_STACK_NX is not set
 # CONFIG_HUAWEI_KERNEL_MODULE_RANDOMIZE is not set
 # CONFIG_HUAWEI_KASLR_DEBUGFS is not set
-# CONFIG_HUAWEI_HIDESYMS is not set
+CONFIG_HUAWEI_HIDESYMS=y
+# CONFIG_HUAWEI_HIDESYMS_DEBUGFS is not set
 # CONFIG_HW_SLUB_SANITIZE is not set
 # CONFIG_HUAWEI_DOUBLE_FREE_CHECK_DEBUGFS is not set
 # CONFIG_HUAWEI_HARDEN_DOUBLE_FREE_CHECK_DEBUGFS is not set
@@ -5956,7 +5930,6 @@ CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_ENC8=y