From e4768a8578b560bbee0c10b64fd6fcf1bd9548dd Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 21 Jul 2025 22:26:56 +0000 Subject: [PATCH] ANDROID: Align x86-64 microdroid kernel configs to aarch64 kernel configs x86-64 and aarch64 kernels should be at feature parity, so update the x86-64 kernel configs to match the aarch64 configs. Note, unline aarch64: - x86-64 requires ZONE_DMA32 to be enabled on 64-bit kernels, so that cannot be disabled. - CONFIG_HOTPLUG_CPU cannot be disabled on x86-64. Bug: 432329937 Change-Id: Id3d6d5ef5016f3984ecc0755788f4ff03e0311ad [isaacmanjarres: resolved merge conflicts from forward porting from android15-6.6.] Signed-off-by: Isaac J. Manjarres --- arch/x86/configs/microdroid_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/x86/configs/microdroid_defconfig b/arch/x86/configs/microdroid_defconfig index 09283c31e518..7958a074a20f 100644 --- a/arch/x86/configs/microdroid_defconfig +++ b/arch/x86/configs/microdroid_defconfig @@ -38,9 +38,7 @@ CONFIG_NR_CPUS=32 CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="stack_depot_disable=on cgroup_disable=pressure ioremap_guard panic=-1 bootconfig acpi=noirq" -CONFIG_PM_WAKELOCKS=y -CONFIG_PM_WAKELOCKS_LIMIT=0 -# CONFIG_PM_WAKELOCKS_GC is not set +# CONFIG_SUSPEND is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_TIMES=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -60,8 +58,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +# CONFIG_ZONE_DMA is not set CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y CONFIG_LRU_GEN=y @@ -81,8 +78,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_IOV=y CONFIG_PCIE_DW_PLAT_EP=y CONFIG_PCI_ENDPOINT=y -CONFIG_FW_LOADER_USER_HELPER=y -# CONFIG_FW_CACHE is not set +# CONFIG_FW_LOADER is not set CONFIG_OF=y CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y @@ -128,12 +124,13 @@ CONFIG_MFD_SYSCON=y # CONFIG_USB_SUPPORT is not set CONFIG_EDAC=y CONFIG_RTC_CLASS=y -CONFIG_DMABUF_HEAPS=y -CONFIG_DMABUF_SYSFS_STATS=y CONFIG_UIO=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y CONFIG_STAGING=y +# CONFIG_IOMMU_SUPPORT is not set +# CONFIG_ANDROID_KABI_RESERVE is not set +# CONFIG_ANDROID_VENDOR_OEM_DATA is not set CONFIG_LIBNVDIMM=y CONFIG_EXT4_FS=y # CONFIG_EXT4_USE_FOR_EXT2 is not set