summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Chancellor <nathan@kernel.org>2022-02-01 13:56:22 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-25 12:06:46 +0100
commit0f59e08070ba92b732a0e9c68be516c6afab0097 (patch)
treef5085c8b40a63e34be7e40bcc003e91281e29442
parent3597fd5f9217d6b7c24f3aefea629484a5505764 (diff)
downloadlinux-0f59e08070ba92b732a0e9c68be516c6afab0097.tar.gz
linux-0f59e08070ba92b732a0e9c68be516c6afab0097.tar.bz2
linux-0f59e08070ba92b732a0e9c68be516c6afab0097.zip
scripts/pahole-flags.sh: Use pahole-version.sh
commit 2d6c9810eb8915c4ddede707b8e167a1d919e1ca upstream. Use pahole-version.sh to get pahole's version code to reduce the amount of duplication across the tree. Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20220201205624.652313-4-nathan@kernel.org Signed-off-by: Matthias Maennich <maennich@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rwxr-xr-xscripts/pahole-flags.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index 7acee326aa6c..d38fa6d84d62 100755
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -7,7 +7,7 @@ if ! [ -x "$(command -v ${PAHOLE})" ]; then
exit 0
fi
-pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
+pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE})
if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
# pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars