iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

objtool: Use existing global variables for options

Browse Source 
Use the existing global variables instead of passing them around and
creating duplicate global variables.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2018-01-16 17:16:32 +01:00 committed by Ingo Molnar
parent 531bb52a86
commit 43a4525f80
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/objtool/builtin-check.c
View File

@ -53,5 +53,5 @@ int cmd_check(int argc, const char **argv)
objname = argv[0]; objname = argv[0];
return check(objname, no_fp, no_unreachable, false); return check(objname, false);
} }

6
tools/objtool/builtin-orc.c
View File

@ -25,7 +25,6 @@
*/ */
#include <string.h> #include <string.h>
#include <subcmd/parse-options.h>
#include "builtin.h" #include "builtin.h"
#include "check.h" #include "check.h"
@ -36,9 +35,6 @@ static const char *orc_usage[] = {
NULL, NULL,
}; };
extern const struct option check_options[];
extern bool no_fp, no_unreachable;
int cmd_orc(int argc, const char **argv) int cmd_orc(int argc, const char **argv)
{ {
const char *objname; const char *objname;
@ -54,7 +50,7 @@ int cmd_orc(int argc, const char **argv)
objname = argv[0]; objname = argv[0];
return check(objname, no_fp, no_unreachable, true); return check(objname, true);
} }
if (!strcmp(argv[0], "dump")) { if (!strcmp(argv[0], "dump")) {

5
tools/objtool/builtin.h
View File

@ -17,6 +17,11 @@
#ifndef _BUILTIN_H #ifndef _BUILTIN_H
#define _BUILTIN_H #define _BUILTIN_H
#include <subcmd/parse-options.h>
extern const struct option check_options[];
extern bool no_fp, no_unreachable;
extern int cmd_check(int argc, const char **argv); extern int cmd_check(int argc, const char **argv);
extern int cmd_orc(int argc, const char **argv); extern int cmd_orc(int argc, const char **argv);

5
tools/objtool/check.c
View File

@ -18,6 +18,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "builtin.h"
#include "check.h" #include "check.h"
#include "elf.h" #include "elf.h"
#include "special.h" #include "special.h"
@ -33,7 +34,6 @@ struct alternative {
}; };
const char *objname; const char *objname;
static bool no_fp;
struct cfi_state initial_func_cfi; struct cfi_state initial_func_cfi;
struct instruction *find_insn(struct objtool_file *file, struct instruction *find_insn(struct objtool_file *file,
@ -2022,13 +2022,12 @@ static void cleanup(struct objtool_file *file)
elf_close(file->elf); 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; struct objtool_file file;
int ret, warnings = 0; int ret, warnings = 0;
objname = _objname; objname = _objname;
no_fp = _no_fp;
file.elf = elf_open(objname, orc ? O_RDWR : O_RDONLY); file.elf = elf_open(objname, orc ? O_RDWR : O_RDONLY);
if (!file.elf) if (!file.elf)

2
tools/objtool/check.h
View File

@ -63,7 +63,7 @@ struct objtool_file {
bool ignore_unreachables, c_file, hints; 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 instruction *find_insn(struct objtool_file *file,
struct section *sec, unsigned long offset); struct section *sec, unsigned long offset);