From nobody Tue Dec 16 11:45:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C67AAC61DA4 for ; Thu, 23 Feb 2023 11:54:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233761AbjBWLyL (ORCPT ); Thu, 23 Feb 2023 06:54:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233862AbjBWLyI (ORCPT ); Thu, 23 Feb 2023 06:54:08 -0500 Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 610F84E5DC for ; Thu, 23 Feb 2023 03:54:02 -0800 (PST) Received: by mail-wr1-x44a.google.com with SMTP id bh3-20020a05600005c300b002c70d6e2014so971418wrb.10 for ; Thu, 23 Feb 2023 03:54:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=FE6DqTLa6oLIEcPK8T4wTKxiA51jr0clK07mi2rNw2M=; b=PCA1tagJIsI7O+0Bx91eiRyRj2mKFxg7YgxeG2hiFjGAkBFhJObVBdaX5v3431ZEvi QovW3mswBo0Dd4w+1Sv4M+dZfczp16Gn7Mz9NxP/t7fHurKot3MBQzldi8C6RdNScM0G 8TkJtO3v8/XSFVuN6CB8qbxamo1YbIspXY25ssxZuVbn+nXQb59erqHi0GEnBfTaArKz 0MpRsi+ZrngfSgMRwQgXbOusuOFa9Xxm0Q3AYvM6fFsw1KB71GawmE8BHB1dKkjQRdHj j8KxAU3QkdAjzM21kiTIzDS+t5wXvLAH6KlFpew7ja9CWa+YIK2QUqVPdToMzinhXFWP 3Ptw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FE6DqTLa6oLIEcPK8T4wTKxiA51jr0clK07mi2rNw2M=; b=QIy+KrgF5nOacekXtqQVsxMn4nhGr1M80YH60Xsvt7PdmZqyVTB86qU/fZ6Sp466od UxrZwaLwQQXtywdH7SUi4xx6ke0cA0To5Nm0lrZ+LD9XHPgjRJLX3PMs0Zqooj9M8MID 0UkDaSi+Lr7hgTSGuHhQE5JXAN5eHePxPaofg38Q0vjInrVkd1apVUWFYl5pDGXcfc75 s0aYmb3h3xHgYgr/3928QzYgBW9QDyd+ILEfr2+yT4lPq4M9yVJp5IHAWEtzFod6jNed wcOkVZIVhROOXTpLsTDvPhz/74oMC37Ga0Gu9rMY1hYbc/Xj07fwNCNiLezaPPt5CO9q MsZA== X-Gm-Message-State: AO0yUKVlf/5+EE0C93tnN3zNijaUjODVLR8L59fqsbSZ2LzHwI31IspR n35cUZ4opw+/2eeNe2np46pPv7hd3s+iLr9Lj+T/Q7rl2r03saOpchwkJz4v8Xl9jTb+0JroLWG 6KI2It1qgwfUqBHb6tpdNei3mjVdHeXbdfvpH/ASeMdI8XVBn2Pf+RFvATAvIWO/kKBZ2IDywk7 g= X-Google-Smtp-Source: AK7set+MzHKyhEA2oOA6t+AlfF6nP4ofet3+WO/YMFBvJ6teFYUWCd8hM7C3mV/3f3gi+7jzaSX8rRR7sv2Pcg== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:209:cf33:dc28:3e98:f5e9]) (user=maennich job=sendgmr) by 2002:a05:600c:1c04:b0:3dd:b278:27e9 with SMTP id j4-20020a05600c1c0400b003ddb27827e9mr1415658wms.71.1677153240667; Thu, 23 Feb 2023 03:54:00 -0800 (PST) Date: Thu, 23 Feb 2023 11:53:49 +0000 In-Reply-To: <20220201205624.652313-1-nathan@kernel.org> Message-Id: <20230223115351.1241401-3-maennich@google.com> Mime-Version: 1.0 References: <20220201205624.652313-1-nathan@kernel.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [PATCH v5.15 v2 2/4] scripts/pahole-flags.sh: Use pahole-version.sh From: Matthias Maennich To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, stable@vger.kernel.org, Greg Kroah-Hartman , Nathan Chancellor , Andrii Nakryiko , Daniel Borkmann Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Nathan Chancellor [ Upstream commit 2d6c9810eb8915c4ddede707b8e167a1d919e1ca ] Use pahole-version.sh to get pahole's version code to reduce the amount of duplication across the tree. Signed-off-by: Nathan Chancellor Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220201205624.652313-4-nathan@kernel.org Signed-off-by: Matthias Maennich --- scripts/pahole-flags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 =20 -pahole_ver=3D$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/') +pahole_ver=3D$($(dirname $0)/pahole-version.sh ${PAHOLE}) =20 if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars --=20 2.39.2.637.g21b0678d19-goog