diff options
| author | Sandeep Patil <sspatil@google.com> | 2019-08-08 08:50:56 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2019-09-16 13:09:02 +0530 |
| commit | bece2d514d6f0024db4b1aa45ca40b30d52589f2 (patch) | |
| tree | 97a16a25661faa33b13505c568739f4f4a76f901 /arch | |
| parent | 26f9c0d67146d0c5cd96903413f3b9e20f0635ed (diff) | |
ANDROID: staging: ion: split system and system-contig heaps
This will allows us to build and load them both as individual
kernel modules.
Bug: 133508579
Test: ion-unit-tests
Change-Id: I8bdada5531fbf148e4d097e94e406a232874913a
Signed-off-by: Sandeep Patil <sspatil@google.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 3ddfc344ef0f..d7b09acb018c 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -393,6 +393,7 @@ 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_COMMON_CLK_XGENE is not set CONFIG_MAILBOX=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 6d5f35ffd52c..52a102b2eb57 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -416,9 +416,10 @@ CONFIG_STAGING=y CONFIG_ASHMEM=y CONFIG_ANDROID_VSOC=y CONFIG_ION=y -CONFIG_ION_SYSTEM_HEAP=y # CONFIG_X86_PLATFORM_DEVICES is not set # CONFIG_IOMMU_SUPPORT is not set +CONFIG_ION_SYSTEM_HEAP=y +CONFIG_ION_SYSTEM_CONTIG_HEAP=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_EXT4_FS=y |