From patchwork Sat Feb 4 10:17:11 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: 52766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1309636wrn; Sat, 4 Feb 2023 03:25:06 -0800 (PST) X-Google-Smtp-Source: AK7set9r9E1OZD+A4QXfj7FsA6klb7FC6Pt7SoVf3GX1fW4gPSSNzEtGu3T+FNJYvDD0w/gT4keb X-Received: by 2002:aa7:d6d9:0:b0:4a2:4abd:b800 with SMTP id x25-20020aa7d6d9000000b004a24abdb800mr12742843edr.35.1675509906038; Sat, 04 Feb 2023 03:25:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675509906; cv=none; d=google.com; s=arc-20160816; b=HCni0Ukjw/zdmgP3flxVoaALmHZ9AzZDwXRzBicQIc5NglxfPbhPye0J/F+cs2YgoN nmtesg2wxlLX8jqA5pozXyKJ3dTgV5UI7V9cIAXY95OBYdWzYVChSBbu0p7BNP5LbbWA 0Xlx5CXdvtX2es2oyDVjXvtpCnQkLzSF+q+1Kc7b6RadqTyu4xEo1MLCCFSIjU6X+5Xh Mher/cs2M/TfawAtqvZjlfypxF7fuUD7ABKqYQOSsADFC954DXVNAwBfl/XD1x03nsAa oXkswx5qAPb7BgnUK0nlv1B60fgWYa4cQ/6rNBrZMjrsQ48zd6QdJDIYIxtwj5gIbJwn If4w== 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=teelTh+iKlGzQQ4AB4tPE/FpJYA9DHVMjfiKfuy01vc=; b=h0N4dYqvm8yWjDB+N/UzvTmfJHLeeTZsV8hgYvc1RgMBYXQAV8l13h1Ca9eJ1Poiyd 5cJBXhjCB7/Ai4e4dp6irBBcuNyHvNEher2t16zU+Q3J6vaupTNY37TntoU+iGqy7svj OcADcwHO6N1SvCLTeCHj77Hk+fKHb3Knq5hTKhshnToAfzvC+hO0hb4I1o3s/18yrF4D 2RtkzygNYqTmsjjHWCmZqxvvxLhE+GxI9lnSFGSyt7ll9Zdu2KZiybgbXniBsKj/+ugy /WQ/IuViYYUH0b86eX3xURwWX+Vl+yuDH79FVTZLTPLngM+ZERp3SXbFzMRuKW1PI3PJ NvvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=V0a3BAjm; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=A3pzcxqG; 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 ez24-20020a056402451800b004a21633babasi5215430edb.315.2023.02.04.03.24.35; Sat, 04 Feb 2023 03:25:06 -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=V0a3BAjm; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=A3pzcxqG; 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 S233126AbjBDKRw (ORCPT + 99 others); Sat, 4 Feb 2023 05:17:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233379AbjBDKRY (ORCPT ); Sat, 4 Feb 2023 05:17:24 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AF9F6EAFD; Sat, 4 Feb 2023 02:17:14 -0800 (PST) Date: Sat, 04 Feb 2023 10:17:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1675505832; 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=teelTh+iKlGzQQ4AB4tPE/FpJYA9DHVMjfiKfuy01vc=; b=V0a3BAjm+E3zg7sSi505dVxXHfoPLP+JC2KD54/xGTK68enc050gNPsPY262P9BJRu9djX N2x2ZVLlFdcJ4rusP39dC+ttn29r5iqOzLSYS/e96Jlr2mS9gDa3yHfiJ/H21P3B3v4ffU uSTUyz3gjGa1chc5MFX5JSv4zvJKZptdMYBg0ZjLu14m8NknZzmJFlOZnNFqRXp1kqaHfV Qfr2GpzEJroFgBPJEQAy/9Sq87puzXkEhG8ESBE1LThn7sU1Av82pv2+euGsT2wx0kKWWL ki7ouGhzv6cVfV+gWYuYDG3uHYhMRIHQzVJRM3vD3ucS5dxzDC/8UnQo8pkcbA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1675505832; 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=teelTh+iKlGzQQ4AB4tPE/FpJYA9DHVMjfiKfuy01vc=; b=A3pzcxqGbGKxGwRKxh4Cdgn+Ouec3pOJGBSWWSEFoJ6NRvdKkyiwuoBS/JbVN6wMAsn8PQ KtXF/dzHhsINTSBA== 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: <167550583192.4906.13829880413446846923.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?1756899475226124480?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: cfd66e81799f4a2fdc6447fa99bdb1871f45ff08 Gitweb: https://git.kernel.org/tip/cfd66e81799f4a2fdc6447fa99bdb1871f45ff08 Author: Thomas Weißschuh AuthorDate: Tue, 27 Dec 2022 16:00:58 Committer: Josh Poimboeuf CommitterDate: Wed, 01 Feb 2023 09:15:23 -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;