From b7d4cf60e79d04bce1ba0870d173d53400b5d2bb Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 28 May 2024 17:12:58 +0000 Subject: [PATCH] Revert "BACKPORT: FROMGIT: module: allow UNUSED_KSYMS_WHITELIST ..." Revert submission 3101887-android14-ksyms-wl Reason for revert: Restore green in release builds Reverted changes: /q/submissionid:3101887-android14-ksyms-wl Change-Id: Ia6c694be720c7a07abdfee6a4720a4518ea59141 --- init/Kconfig | 2 +- scripts/gen_autoksyms.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index bdb88d3f7812..57a8e6746a42 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -2375,7 +2375,7 @@ config UNUSED_KSYMS_WHITELIST exported at all times, even in absence of in-tree users. The value to set here is the path to a text file containing the list of symbols, one per line. The path can be absolute, or relative to the kernel - source or obj tree. + source tree. endif # MODULES diff --git a/scripts/gen_autoksyms.sh b/scripts/gen_autoksyms.sh index 7dd95eafdaaf..117cb07bd043 100755 --- a/scripts/gen_autoksyms.sh +++ b/scripts/gen_autoksyms.sh @@ -36,7 +36,7 @@ ksym_wl= if [ -n "$CONFIG_UNUSED_KSYMS_WHITELIST" ]; then # Use 'eval' to expand the whitelist path and check if it is relative eval ksym_wl="$CONFIG_UNUSED_KSYMS_WHITELIST" - [ "${ksym_wl}" != "${ksym_wl#/}" ] || [ -f "$ksym_wl" ] || ksym_wl="$abs_srctree/$ksym_wl" + [ "${ksym_wl}" != "${ksym_wl#/}" ] || ksym_wl="$abs_srctree/$ksym_wl" if [ ! -f "$ksym_wl" ] || [ ! -r "$ksym_wl" ]; then echo "ERROR: '$ksym_wl' whitelist file not found" >&2 exit 1