From 3a105c3cafa0dc02dfe0dc6d5075bfee5ebfdab6 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Mon, 7 Mar 2022 22:09:20 -0800 Subject: [PATCH] ANDROID: ABI: modify exports for find_vma A previous change [1] inlined find_vma function, resulting in its removal from the exported kernel symbols and replacement with __find_vma. This function is implemented in the header file and is still available to drivers, but exported function is changed to __find_vma. This causes ABI breakage with the following error: ERROR: Differences between ksymtab and symbol list detected! Symbols missing from ksymtab: - find_vma Replace find_vma with new __find_vma in the symbol lists. [1] https://lore.kernel.org/all/20220128131006.67712-13-michel@lespinasse.org/ Bug: 161210518 Signed-off-by: Suren Baghdasaryan Change-Id: I23fdb68b7fd4d907354fc5902dca9ddec8060319 --- android/abi_gki_aarch64_db845c | 2 +- android/abi_gki_aarch64_mtktv | 2 +- android/abi_gki_aarch64_pixel | 2 +- android/abi_gki_aarch64_qcom | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c index 3b8b7ad5fcdb..fd78d05951ee 100644 --- a/android/abi_gki_aarch64_db845c +++ b/android/abi_gki_aarch64_db845c @@ -933,7 +933,7 @@ dma_buf_unmap_attachment dma_get_sgtable_attrs down_read - find_vma + __find_vma kasan_flag_enabled __mmap_lock_do_trace_acquire_returned __mmap_lock_do_trace_released diff --git a/android/abi_gki_aarch64_mtktv b/android/abi_gki_aarch64_mtktv index 33f0e5a86f7f..c27e83ce5dbf 100644 --- a/android/abi_gki_aarch64_mtktv +++ b/android/abi_gki_aarch64_mtktv @@ -568,7 +568,7 @@ _find_first_bit find_get_pid _find_next_bit - find_vma + __find_vma finish_wait flush_dcache_page flush_delayed_work diff --git a/android/abi_gki_aarch64_pixel b/android/abi_gki_aarch64_pixel index 70c9270887d1..083f79449940 100644 --- a/android/abi_gki_aarch64_pixel +++ b/android/abi_gki_aarch64_pixel @@ -686,7 +686,7 @@ find_get_pid _find_next_bit find_task_by_vpid - find_vma + __find_vma finish_wait flush_work flush_workqueue diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 3da7ef2736b2..35ac8245fd9e 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -691,8 +691,8 @@ extcon_set_state_sync fd_install fget - find_vma find_vpid + __find_vma finish_wait firmware_request_nowarn flush_dcache_page