diff --git a/arch/arm64/configs/generic_vm_defconfig b/arch/arm64/configs/generic_vm_defconfig
index 91791e4f5ebf..9fa35a02a34d 100644
--- a/arch/arm64/configs/generic_vm_defconfig
+++ b/arch/arm64/configs/generic_vm_defconfig
@@ -23,14 +23,6 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_RSEQ is not set
 CONFIG_EMBEDDED=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB_MERGE_DEFAULT is not set
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-# CONFIG_ZONE_DMA is not set
-# CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_QCOM=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=32
@@ -47,7 +39,6 @@ CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_CPU_IDLE=y
-CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_PSCI_CPUIDLE=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_ARM64_CRYPTO=y
@@ -60,10 +51,17 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SIG=y
 # CONFIG_BLK_DEBUG_FS is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_SLAB_MERGE_DEFAULT is not set
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_COMPAT_BRK is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_CMA=y
 CONFIG_CMA_AREAS=16
+# CONFIG_ZONE_DMA is not set
+# CONFIG_ZONE_DMA32 is not set
 CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_NETWORK_SECMARK=y
@@ -78,6 +76,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_QCOM_EBI2 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_VIRTIO_BLK=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
@@ -88,8 +87,8 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_VERITY=y
-CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+CONFIG_DM_VERITY_FEC=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CORE is not set
 # CONFIG_ETHERNET is not set
@@ -115,11 +114,13 @@ CONFIG_WATCHDOG_CORE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
-CONFIG_DMADEVICES=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_UIO=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_SWIOTLB=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_VENDOR_HOOKS=y
 CONFIG_EXT4_FS=y
@@ -137,14 +138,15 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,appar
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_SWIOTLB_NONLINEAR=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CALLER=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_HEADERS_INSTALL=y
 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
+# CONFIG_SLUB_DEBUG is not set
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_TIMEOUT=-1
 CONFIG_SOFTLOCKUP_DETECTOR=y
@@ -154,7 +156,3 @@ CONFIG_SCHEDSTATS=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_RUNTIME_TESTING_MENU is not set
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_MMIO_SWIOTLB=y
-CONFIG_SWIOTLB_NONLINEAR=y