From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227PPkFJX4WqjoT/tMbNdu8zRxa6MvzGPgDaBc3GRTIfCTrZbmyG9eL87w7CZ0b8AZOMksS2 ARC-Seal: i=1; a=rsa-sha256; t=1516721589; cv=none; d=google.com; s=arc-20160816; b=MTRZgU0vdGLCKE2Xd/d5qoRKZlyKtmfrXNC3HP3iVmL9vSOsvpJxSh6UuqNwzpxZEl AJ9vexKMecresmQ0H3ekQFEzkAg9r92tfICpJEQCgNAxO7yYCSLZQa/RYvdrv31C1ovD raa4nvXWctE7z9DSeU4NFZRX5A0bGdMqLB7bkkUB0uwFQu4ZuzfDe9BWHK60NmV5Ph6b SrbLI3vIgdCMCVeg+46ZX/GNPa7Mm3/XfceU+OhcKkLa8i5Uy9NJlRj7ZrGJ/SUJQtpk Z1fZz3cB/1IxxE1pLMt2tvQrADp2wmrpwinBBUWYp6X4TCo4OhzlMP8ANS4gjDmcFWtQ cwHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature:arc-authentication-results; bh=q5vTT/c+EE4q07hDNIjWZIukanqJnuBNDjAy6OPNTDc=; b=kutF/UYP+yLGXjRIZDnVC4lK/dxRo0IO4GCNCKdBKW20mw3zx4KYzMkV7MLD7Srk2r K7D2KowDba7yaPLhc1PT8LYtY8CDyFDIjRMMYnl7JC/u/WSfifI08wHeXKqMoYTyIPas 5gN8IIMHHmrpTIn09m1WFnzXKIgimDL6YVPASPtosWVnk7RPjFjakNVTNsTh+YlVBg7y jmgvZJxqKG8chSZzSj45NHjQhFF6Bwv/U2TFB/cJDJdEK8VRS7CItTE4XZ+kAuOcH/VF hgwWyDVBMd9ohQSegEJRj54R087Sty7gmXUnjRR22V1ETyIIvjDBsSXmHjNqQXYA+RSI jFBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=pZAjCVA2; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=pZAjCVA2; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org Message-Id: <20180123152638.036749990@infradead.org> User-Agent: quilt/0.63-1 Date: Tue, 23 Jan 2018 16:25:40 +0100 From: Peter Zijlstra To: David Woodhouse , Thomas Gleixner , Josh Poimboeuf Cc: linux-kernel@vger.kernel.org, Dave Hansen , Ashok Raj , Tim Chen , Andy Lutomirski , Linus Torvalds , Greg KH , Andrea Arcangeli , Andi Kleen , Arjan Van De Ven , Dan Williams , Paolo Bonzini , Jun Nakajima , Asit Mallick , Jason Baron , Peter Zijlstra Subject: [PATCH 01/24] objtool: Use existing global variables for options References: <20180123152539.374360046@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-objtool-unclutter.patch X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590397858160153009?= X-GMAIL-MSGID: =?utf-8?q?1590397858160153009?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Use the existing global variables instead of passing them around and creating duplicate global variables. Signed-off-by: Peter Zijlstra (Intel) --- tools/objtool/builtin-check.c | 2 +- tools/objtool/builtin-orc.c | 6 +----- tools/objtool/builtin.h | 5 +++++ tools/objtool/check.c | 5 ++--- tools/objtool/check.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -53,5 +53,5 @@ int cmd_check(int argc, const char **arg objname = argv[0]; - return check(objname, no_fp, no_unreachable, false); + return check(objname, false); } --- a/tools/objtool/builtin-orc.c +++ b/tools/objtool/builtin-orc.c @@ -25,7 +25,6 @@ */ #include -#include #include "builtin.h" #include "check.h" @@ -36,9 +35,6 @@ static const char *orc_usage[] = { NULL, }; -extern const struct option check_options[]; -extern bool no_fp, no_unreachable; - int cmd_orc(int argc, const char **argv) { const char *objname; @@ -51,7 +47,7 @@ int cmd_orc(int argc, const char **argv) objname = argv[0]; - return check(objname, no_fp, no_unreachable, true); + return check(objname, true); } --- a/tools/objtool/builtin.h +++ b/tools/objtool/builtin.h @@ -17,6 +17,11 @@ #ifndef _BUILTIN_H #define _BUILTIN_H +#include + +extern const struct option check_options[]; +extern bool no_fp, no_unreachable; + extern int cmd_check(int argc, const char **argv); extern int cmd_orc(int argc, const char **argv); --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -18,6 +18,7 @@ #include #include +#include "builtin.h" #include "check.h" #include "elf.h" #include "special.h" @@ -33,7 +34,6 @@ struct alternative { }; const char *objname; -static bool no_fp; struct cfi_state initial_func_cfi; struct instruction *find_insn(struct objtool_file *file, @@ -1973,13 +1973,12 @@ static void cleanup(struct objtool_file elf_close(file->elf); } -int check(const char *_objname, bool _no_fp, bool no_unreachable, bool orc) +int check(const char *_objname, bool orc) { struct objtool_file file; int ret, warnings = 0; objname = _objname; - no_fp = _no_fp; file.elf = elf_open(objname, orc ? O_RDWR : O_RDONLY); if (!file.elf) --- a/tools/objtool/check.h +++ b/tools/objtool/check.h @@ -62,7 +62,7 @@ struct objtool_file { bool ignore_unreachables, c_file, hints; }; -int check(const char *objname, bool no_fp, bool no_unreachable, bool orc); +int check(const char *objname, bool orc); struct instruction *find_insn(struct objtool_file *file, struct section *sec, unsigned long offset);