From 4092f6f4620ca7a3e3e7ef052dc402b73a35705d Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Tue, 14 May 2024 22:33:50 +0000 Subject: [PATCH] ANDROID: microdroid: remove CONFIG_DM_INIT Bug: 340543747 Bug: 357781595 Test: build microdroid kernel Test: build com.android.virt APEX Test: run atest MicrodroidTests Change-Id: I108549193de933a1740e899c7d140f727e6321cc Signed-off-by: Nikita Ioffe (cherry picked from commit cf90d4bbe29dd339b242694821e3df597f7d2334) (cherry picked from commit 695e31e50f626d95def1e1a8d677b4adfe572c89) --- arch/arm64/configs/microdroid_defconfig | 1 - arch/x86/configs/microdroid_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/microdroid_defconfig b/arch/arm64/configs/microdroid_defconfig index c8486d5cceca..6028a2f0ab43 100644 --- a/arch/arm64/configs/microdroid_defconfig +++ b/arch/arm64/configs/microdroid_defconfig @@ -113,7 +113,6 @@ CONFIG_VCPU_STALL_DETECTOR=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y -CONFIG_DM_INIT=y CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y CONFIG_DM_VERITY_FEC=y diff --git a/arch/x86/configs/microdroid_defconfig b/arch/x86/configs/microdroid_defconfig index db1b89b486b4..bf4891b4c230 100644 --- a/arch/x86/configs/microdroid_defconfig +++ b/arch/x86/configs/microdroid_defconfig @@ -127,7 +127,6 @@ CONFIG_VIRTIO_BLK=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y -CONFIG_DM_INIT=y CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y CONFIG_DM_VERITY_FEC=y