From a7dbb464f497761f295cd8fcc631b05629fbb4a7 Mon Sep 17 00:00:00 2001 From: Jeevan Shriram Date: Tue, 29 Sep 2020 18:01:32 -0700 Subject: [PATCH] ABI: Update section name in script and internal allowed list With commit 'e83321764 ANDROID: KMI symbol lists: migrate section name' section name is updated for allowed list. Update the usage to symbol_list in script as well. Change-Id: Ie6aa6706405a8b0a79359d4314679c48e42160db Signed-off-by: Jeevan Shriram --- android/abi_gki_aarch64_qcom_internal | 2 +- scripts/gen_autoksyms.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/abi_gki_aarch64_qcom_internal b/android/abi_gki_aarch64_qcom_internal index df3d80b6aea4..adc2d0594099 100644 --- a/android/abi_gki_aarch64_qcom_internal +++ b/android/abi_gki_aarch64_qcom_internal @@ -1,6 +1,6 @@ # List of symbols exported by QCOM in-kernel drivers and used by external DLKMs # QCOM internal whitelist -[abi_whitelist] +[abi_symbol_list] cnss_lock_pm_sem cnss_release_pm_sem cnss_get_fw_files_for_target diff --git a/scripts/gen_autoksyms.sh b/scripts/gen_autoksyms.sh index 9752b9ca6b6c..aba6c51ffaf4 100755 --- a/scripts/gen_autoksyms.sh +++ b/scripts/gen_autoksyms.sh @@ -48,7 +48,7 @@ EOT sed 's/ko$/mod/' $modlist | xargs -n1 sed -n -e '2{s/ /\n/g;/^$/!p;}' -- | cat - $ksym_wls | -sed 's/^#.*//;s/^ *//;/[[abi_whitelist]]/g' | +sed 's/^#.*//;s/^ *//;/[[abi_symbol_list]]/g' | sort -u | sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file" @@ -62,7 +62,7 @@ if [ -n "$CONFIG_UNUSED_KSYMS_WHITELIST_ONLY" ] && [ -f "vmlinux" ] ; then syms_from_vmlinux="$(mktemp)" cat $ksym_wls | - sed 's/^#.*//;s/^ *//;/[[abi_whitelist]]/g' | + sed 's/^#.*//;s/^ *//;/[[abi_symbol_list]]/g' | sort -u > "$syms_from_whitelist" $NM --defined-only vmlinux |