From 3f139724700e080489f2249b0bab4d22f633e455 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: If86a1a6c7875bace543381575544590823cd092c --- kernel/module/Kconfig | 2 +- scripts/gen_autoksyms.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/module/Kconfig b/kernel/module/Kconfig index ef66cce84d61..6b5c1175faea 100644 --- a/kernel/module/Kconfig +++ b/kernel/module/Kconfig @@ -311,7 +311,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. config MODULES_TREE_LOOKUP def_bool y diff --git a/scripts/gen_autoksyms.sh b/scripts/gen_autoksyms.sh index e12178d677e2..653fadbad302 100755 --- a/scripts/gen_autoksyms.sh +++ b/scripts/gen_autoksyms.sh @@ -31,7 +31,7 @@ fi ksym_wl=$(sed -n 's/^CONFIG_UNUSED_KSYMS_WHITELIST=\(.*\)$/\1/p' include/config/auto.conf) if [ -n "$ksym_wl" ]; then - [ "${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