From 160ab931032d5b1fb01737ea5fc842cbba68a4ee Mon Sep 17 00:00:00 2001 From: Shuosheng Huang Date: Tue, 19 Oct 2021 15:32:13 +0800 Subject: [PATCH] ANDROID: ion heap: init ion heaps in subsys_initcall Some built-in modules will failed to use ion heap to allocate memory if the ion heap drivers are too late to be initialized. To fix this issue, move initialization of ion heap drivers in subsys_initcall() which is more earlier to be called. Bug: 203487618 Signed-off-by: Shuosheng Huang Change-Id: If120225fd6c3b665053857cc9345db4521e76cf8 (cherry picked from commit eb4a5a5dbd5bcc33db06d4515653b7f67a2e927e) --- drivers/staging/android/ion/heaps/ion_cma_heap.c | 2 +- drivers/staging/android/ion/heaps/ion_system_heap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/ion/heaps/ion_cma_heap.c b/drivers/staging/android/ion/heaps/ion_cma_heap.c index 6ba7fd84c9ee..5ae0bacea2fe 100644 --- a/drivers/staging/android/ion/heaps/ion_cma_heap.c +++ b/drivers/staging/android/ion/heaps/ion_cma_heap.c @@ -146,6 +146,6 @@ static void __exit ion_cma_heap_exit(void) ion_device_remove_heap(&cma_heaps[nr].heap); } -module_init(ion_cma_heap_init); +subsys_initcall(ion_cma_heap_init); module_exit(ion_cma_heap_exit); MODULE_LICENSE("GPL v2"); diff --git a/drivers/staging/android/ion/heaps/ion_system_heap.c b/drivers/staging/android/ion/heaps/ion_system_heap.c index 706bd402509d..7727a2b0d849 100644 --- a/drivers/staging/android/ion/heaps/ion_system_heap.c +++ b/drivers/staging/android/ion/heaps/ion_system_heap.c @@ -293,6 +293,6 @@ static void __exit ion_system_heap_exit(void) ion_system_heap_destroy_pools(system_heap.pools); } -module_init(ion_system_heap_init); +subsys_initcall(ion_system_heap_init); module_exit(ion_system_heap_exit); MODULE_LICENSE("GPL v2");