From 9d58fde78c8c6f4da28166486191ce5b2b483280 Mon Sep 17 00:00:00 2001 From: "hyesoo.yu" Date: Thu, 13 Sep 2018 11:13:31 +0900 Subject: [PATCH] [RAMEN9610-12171] ion: allocate zero for system heap id Traditionally, the system heap is was always zero. The heap id is created according to the registered order after kernel 4.12, but the system heap is registered first to provide compatibility with users to use the system heap. Change-Id: I46f203a533f6c29b62ced6b49c0a5a5a98e2a914 Signed-off-by: hyesoo.yu --- drivers/staging/android/ion/ion_fdt_exynos.c | 2 +- drivers/staging/android/ion/ion_system_heap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/ion/ion_fdt_exynos.c b/drivers/staging/android/ion/ion_fdt_exynos.c index 5ae79fa2aab1..f4120684a374 100644 --- a/drivers/staging/android/ion/ion_fdt_exynos.c +++ b/drivers/staging/android/ion/ion_fdt_exynos.c @@ -283,4 +283,4 @@ static int __init exynos_ion_register_heaps(void) return 0; } -subsys_initcall(exynos_ion_register_heaps); +subsys_initcall_sync(exynos_ion_register_heaps); diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index 2b5ff0ada2bd..8003650726c4 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -377,7 +377,7 @@ static int ion_system_heap_create(void) ion_device_add_heap(heap); return 0; } -subsys_initcall_sync(ion_system_heap_create); +subsys_initcall(ion_system_heap_create); static int ion_system_contig_heap_allocate(struct ion_heap *heap, struct ion_buffer *buffer, -- 2.20.1