From c877e4cfa8705165b4950a8762bc35bd7776dae0 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Wed, 12 Feb 2020 23:45:28 -0800 Subject: [PATCH] ANDROID: gki_defconfig: disable system_contig ion heap. Test: build, boot, ion-unit-test Bug: 138149732 Change-Id: Ic7bc1e59c5bdbdda656fbc06e6dcffea6b7740cf Signed-off-by: Hridya Valsaraju --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 6d879cb4b520..044f0db4c6eb 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -365,7 +365,6 @@ CONFIG_ASHMEM=y CONFIG_ANDROID_VSOC=y CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y -CONFIG_ION_SYSTEM_CONTIG_HEAP=y CONFIG_COMMON_CLK_SCPI=y CONFIG_HWSPINLOCK=y CONFIG_MAILBOX=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 4316916f73a5..95239303d325 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -313,7 +313,6 @@ CONFIG_STAGING=y CONFIG_ASHMEM=y CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y -CONFIG_ION_SYSTEM_CONTIG_HEAP=y CONFIG_PM_DEVFREQ=y CONFIG_IIO=y CONFIG_RAS=y