From patchwork Wed Feb 1 16:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 51460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp376153wrn; Wed, 1 Feb 2023 08:30:01 -0800 (PST) X-Google-Smtp-Source: AK7set+dWbKsd9/jDgjW/Ngg/Y12Lrv/Y7hfeTsjrtZu+blFVNxyPVNvz44K5HWlJ2H7wu4QrMZP X-Received: by 2002:a17:90b:33c6:b0:22c:f9d:81c6 with SMTP id lk6-20020a17090b33c600b0022c0f9d81c6mr3011574pjb.20.1675269001448; Wed, 01 Feb 2023 08:30:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675269001; cv=none; d=google.com; s=arc-20160816; b=DSqfMs9doGeFuv7B1vMXqrknnCHWl4+aKiNIqyumksgaghaOS2uvbBoRHwJ1cnjSP8 C4sXvpxPV0FxOtL91wlYbRvdd7VUSp1jW1VxcuFVoYFySJ3XX8XPSWKc9K3n81B04MuN gEWdlUpENHOqk8StWlJWdFO30YR33N7+XxhVbgjBW4+bO48yor2nr9IWcyz1Svgy0pBf Yj6LC6Xxo4r0xUmx1vJaJAASZFrI9IJEzaT5FaKtVQsgzY+ap3jcNDqSTeif+3fRdtm+ 5sxbhMknLqLC2IJ0eQmD+NSHcuCxSwx9lihwtPQajpjsI7GS/KzdBwd5unpGfBIfDgnb rw+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=wDgGM6u+o+EUbvjE0P6jhCCqDJjLLc/y/R8z9Oqo3nE=; b=Fjkctu1wcyvdfN/5PSWRC4sn3LMvGJxsVDiNlDUCP7gJ7apV6HdGhs92svT4ugdCpV trwdRKoGAJsh5Pv9xU/pHYY/Agy49BRN6q8cv3ngRMQx0ppvTOQadxbeLJQeuGg7M7ED c+Fs1ob3zc6F9RyfITtiOXoXKYGLmAi+da28YtuHddg+umGY6dUOUS+IBZu/g5HZSuoc kahYhhvteOfN/m6d3OzziGeAbet105+ge4je8FNHm4YlypyQxt6K7R/ImXgr5460dKYR GLkbrnENavwKauDKan5nfF/Z5OBAcfV0JbXCQZbb5j8vEVWqxB3BVKur3R4qmhT2hiKA pqPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3imXThR6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z16-20020a17090a541000b0022c05520917si1957118pjh.28.2023.02.01.08.29.49; Wed, 01 Feb 2023 08:30:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3imXThR6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231543AbjBAQ0m (ORCPT + 99 others); Wed, 1 Feb 2023 11:26:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231529AbjBAQ0i (ORCPT ); Wed, 1 Feb 2023 11:26:38 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F4E47920F; Wed, 1 Feb 2023 08:26:35 -0800 (PST) Date: Wed, 01 Feb 2023 16:26:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1675268794; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wDgGM6u+o+EUbvjE0P6jhCCqDJjLLc/y/R8z9Oqo3nE=; b=3imXThR67z4s66ri7suGxkA76IZmEaTLZAQMKoJSle8oVu0qzmBkfA4shMnvn/ttN0VD+1 P1CBYTrw/AzBSrhfeMsV1+phL2YZlNTO3aqtwwHLpcfX8D9hK9e0nfVhtVyhJQji5JxVkr LvE3O+KkLESuEKkyx/A4GBROGjJE2risD18sGeuvOHLtvzuStQqBm3G6RZPStfMpnO0fGC mgZdI/PrWtxGBOxzIL0681irWn6h1bRaNQhhKaPMIl/tM0np/vqfZQ5H+YUi1q0kzYc2c4 pOUTgN+XNQ1NAqgjfBYYNi0BmBO8F/Ixr730o9YeHCefLeup+D6AFkgEkJzlwg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1675268794; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wDgGM6u+o+EUbvjE0P6jhCCqDJjLLc/y/R8z9Oqo3nE=; b=eQSSN0+rS4sFZwJSRqhWOHsopKbpGiDxDpDazghww5ao3sSGqCeKlKDHVmOZ/oU3eB38Kj fpCT12vWtTmuYIBg== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] objtool: Make struct check_options static Cc: linux@weissschuh.net, Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221216-objtool-memory-v2-2-17968f85a464@weissschuh.net> References: <20221216-objtool-memory-v2-2-17968f85a464@weissschuh.net> MIME-Version: 1.0 Message-ID: <167526879412.4906.12774943479033852238.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756646868681908801?= X-GMAIL-MSGID: =?utf-8?q?1756646868681908801?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: 3b066cdf0893993dcbfabe9ac443e6ff84df6218 Gitweb: https://git.kernel.org/tip/3b066cdf0893993dcbfabe9ac443e6ff84df6218 Author: Thomas Weißschuh AuthorDate: Tue, 27 Dec 2022 16:00:58 Committer: Josh Poimboeuf CommitterDate: Mon, 30 Jan 2023 16:28:18 -08:00 objtool: Make struct check_options static It is not used outside of builtin-check.c. Also remove the unused declaration from builtin.h . Signed-off-by: Thomas Weißschuh Link: https://lore.kernel.org/r/20221216-objtool-memory-v2-2-17968f85a464@weissschuh.net Signed-off-by: Josh Poimboeuf --- tools/objtool/builtin-check.c | 2 +- tools/objtool/include/objtool/builtin.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index a4f3940..7c17519 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -65,7 +65,7 @@ static int parse_hacks(const struct option *opt, const char *str, int unset) return found ? 0 : -1; } -const struct option check_options[] = { +static const struct option check_options[] = { OPT_GROUP("Actions:"), OPT_CALLBACK_OPTARG('h', "hacks", NULL, NULL, "jump_label,noinstr,skylake", "patch toolchain bugs/limitations", parse_hacks), OPT_BOOLEAN('i', "ibt", &opts.ibt, "validate and annotate IBT"), diff --git a/tools/objtool/include/objtool/builtin.h b/tools/objtool/include/objtool/builtin.h index fa45044..2a108e6 100644 --- a/tools/objtool/include/objtool/builtin.h +++ b/tools/objtool/include/objtool/builtin.h @@ -7,8 +7,6 @@ #include -extern const struct option check_options[]; - struct opts { /* actions: */ bool dump_orc;