From d0ba9bad59a942e0137c2a34e1ef227c5de3876f Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 7 Jun 2022 20:53:29 +0000 Subject: [PATCH] ANDROID: ABI: replace blk_ksm functions in symbol lists devm_blk_crypto_profile_init needs to be used instead of devm_blk_ksm_init and blk_ksm_init_passthrough, which no longer exist. Bug: 160883801 Bug: 162257402 Bug: 207390665 Bug: 234653003 Change-Id: Id71381d88b60141b37c5b38bfbbacec5b05101b7 Signed-off-by: Eric Biggers --- android/abi_gki_aarch64_db845c | 2 +- android/abi_gki_aarch64_exynosauto | 2 +- android/abi_gki_aarch64_imx | 2 +- android/abi_gki_aarch64_mtk | 2 +- android/abi_gki_aarch64_pixel | 2 +- android/abi_gki_aarch64_qcom | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c index fd78d05951ee..c0fd0331330d 100644 --- a/android/abi_gki_aarch64_db845c +++ b/android/abi_gki_aarch64_db845c @@ -908,7 +908,7 @@ seq_putc # required by cqhci.ko - devm_blk_ksm_init + devm_blk_crypto_profile_init dmam_free_coherent mmc_cqe_request_done diff --git a/android/abi_gki_aarch64_exynosauto b/android/abi_gki_aarch64_exynosauto index 8de257974128..d4aa55c9f76b 100644 --- a/android/abi_gki_aarch64_exynosauto +++ b/android/abi_gki_aarch64_exynosauto @@ -37,7 +37,6 @@ blk_cleanup_disk blk_execute_rq blk_get_request - blk_ksm_init_passthrough __blk_mq_alloc_disk blk_mq_alloc_tag_set blk_mq_complete_request @@ -226,6 +225,7 @@ _dev_info __dev_kfree_skb_any devm_add_action + devm_blk_crypto_profile_init devm_clk_get devm_clk_get_optional devm_clk_put diff --git a/android/abi_gki_aarch64_imx b/android/abi_gki_aarch64_imx index 5fd8e415bf1b..834ba662d6ef 100644 --- a/android/abi_gki_aarch64_imx +++ b/android/abi_gki_aarch64_imx @@ -1137,7 +1137,7 @@ policy_has_boost_freq # required by cqhci.ko - devm_blk_ksm_init + devm_blk_crypto_profile_init mmc_cqe_request_done # required by drm_dp_aux_bus.ko diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk index 48986183eb61..13410b93ab82 100644 --- a/android/abi_gki_aarch64_mtk +++ b/android/abi_gki_aarch64_mtk @@ -315,7 +315,7 @@ __dev_kfree_skb_any devm_add_action __devm_alloc_percpu - devm_blk_ksm_init + devm_blk_crypto_profile_init devm_clk_bulk_get devm_clk_bulk_get_optional devm_clk_get diff --git a/android/abi_gki_aarch64_pixel b/android/abi_gki_aarch64_pixel index c09dcd2f83eb..927e81b3f47f 100644 --- a/android/abi_gki_aarch64_pixel +++ b/android/abi_gki_aarch64_pixel @@ -312,7 +312,7 @@ devm_add_action devm_backlight_device_register devm_backlight_device_unregister - devm_blk_ksm_init + devm_blk_crypto_profile_init devm_clk_get devm_clk_get_optional devm_clk_put diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 7a01b1e67e5c..5f49e214a6c8 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -334,7 +334,7 @@ _dev_info devm_add_action devm_alloc_etherdev_mqs - devm_blk_ksm_init + devm_blk_crypto_profile_init devm_clk_bulk_get_all devm_clk_get devm_clk_get_optional