From patchwork Mon Feb 7 15:15:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=udI58gyI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JsqTV3t3Fz9s5B for ; Tue, 8 Feb 2022 02:15:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nH5jp-0003I2-9y; Mon, 07 Feb 2022 15:15:33 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nH5jm-0003Dp-Df for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:30 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id DA4313F1CA for ; Mon, 7 Feb 2022 15:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246929; bh=hANXAM2QIhFgJs4T6MF2qsWZL0SHwNyX+cp2FFsZFCc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=udI58gyIkgiSe2U5FaA7chRZXJAPtdEqi3MHsCYynfg8j2VogdJq/+zdAwupR8Nlk vl4FSwm4d6/iZdxl8+7DQ37bgTWGdFy7oUCQk2szxnOuT+MoEk/PVEaJmK2SN3sp/P 493D30MS4OGh1xlSzUO5m4a0llj/IjU2OV9kvlW9U7Y9qp3ax8ef+ylQTpd4fUM03h DXVzZ7RxA5fOTQ1cS+3QKzPNsn0J1gUZskTgwKqtXHTTMO/kJqQZWPkY8w8fJ2ZiAM czOaw9kdIxntyQNDiKoXwaewvKQXdAdBuh+Dv+345WrxuSie2vLj9DhDKx+1opV0Lg RwSUcaU51ODqg== Received: by mail-ej1-f71.google.com with SMTP id qq4-20020a17090720c400b006c6a6c55ed6so1817739ejb.12 for ; Mon, 07 Feb 2022 07:15:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hANXAM2QIhFgJs4T6MF2qsWZL0SHwNyX+cp2FFsZFCc=; b=oRQcHosRyvIiZk2WL7h54KKR4Yb5LCbord6Mp/j8EygRuJfUdYFzakT+9OWI3AbdfL 0duqcZc3YQYR6CUk7l6U9iuayn1E+IlDCvATDfk/VLwVtcjb6SfLWDg2xxYehxPlcbiP NW0vos5KstjWUvjRg0p9QtC+JY45qDZPT5mcb8ma98UeJKRi7/0131QwIAYN9/7AzDjm Uic5NAKFgwG3AqUgglgLLhDmXbdy/uoi0TDNvhsKyVyxjFkj7HtkVcUtpCthh13xzbR2 yn++fLS8kbufhbNPtFcXb0oO+Q5CyT6/6s91ZlwhIdrw9TMzXaHGaang7Nx5dvWHc+l4 IzfQ== X-Gm-Message-State: AOAM533976cbi8FRNDYzRabJsZyKg81cfRZawsoMSJDhC2V0ugejFPLF 2MjCu+j0P5PVsS09dk9bLGrSBgvAhVHCBVkPJqnpEpQx6W4o2tPO51d4DgZLjao5zSD6Ho25x8W Z3QKzGwbq5AqQ5svgclgKNnFSjdMX/9N+0Rg7BSgkCA== X-Received: by 2002:a17:907:60cb:: with SMTP id hv11mr184116ejc.122.1644246929366; Mon, 07 Feb 2022 07:15:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQFo0WzqgCP759sSV0WOckPX7t4w7MpLt6qCnhqMCikfsOhugtm+XbhgHQB8UDUCtV8H3GlA== X-Received: by 2002:a17:907:60cb:: with SMTP id hv11mr184109ejc.122.1644246929145; Mon, 07 Feb 2022 07:15:29 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id fw16sm1591540ejc.120.2022.02.07.07.15.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:28 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 4/7] scripts/pahole-flags.sh: Use pahole-version.sh Date: Mon, 7 Feb 2022 15:15:13 +0000 Message-Id: <20220207151516.211675-5-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Nathan Chancellor 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 (cherry picked from bpf-next commit 2d6c9810eb8915c4ddede707b8e167a1d919e1ca) Signed-off-by: Dimitri John Ledkov --- 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 2b99fc7701..ac8b237874 100755 --- a/scripts/pahole-flags.sh +++ b/scripts/pahole-flags.sh @@ -7,7 +7,7 @@ if ! [ -x "$(command -v ${PAHOLE})" ]; then return 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