OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[tomoyo/tomoyo-test1.git]
/
tools
/
perf
/
perf.c
diff --git
a/tools/perf/perf.c
b/tools/perf/perf.c
index
1b3fc8e
..
20a08cb
100644
(file)
--- a/
tools/perf/perf.c
+++ b/
tools/perf/perf.c
@@
-73,7
+73,7
@@
static struct cmd_struct commands[] = {
{ "lock", cmd_lock, 0 },
{ "kvm", cmd_kvm, 0 },
{ "test", cmd_test, 0 },
{ "lock", cmd_lock, 0 },
{ "kvm", cmd_kvm, 0 },
{ "test", cmd_test, 0 },
-#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)
+#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE
_SUPPORT
)
{ "trace", cmd_trace, 0 },
#endif
{ "inject", cmd_inject, 0 },
{ "trace", cmd_trace, 0 },
#endif
{ "inject", cmd_inject, 0 },
@@
-190,6
+190,12
@@
static int handle_options(const char ***argv, int *argc, int *envchanged)
break;
}
break;
}
+ if (!strcmp(cmd, "-vv")) {
+ (*argv)[0] = "version";
+ version_verbose = 1;
+ break;
+ }
+
/*
* Check remaining flags.
*/
/*
* Check remaining flags.
*/
@@
-485,7
+491,7
@@
int main(int argc, const char **argv)
argv[0] = cmd;
}
if (strstarts(cmd, "trace")) {
argv[0] = cmd;
}
if (strstarts(cmd, "trace")) {
-#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)
+#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE
_SUPPORT
)
setup_path();
argv[0] = "trace";
return cmd_trace(argc, argv);
setup_path();
argv[0] = "trace";
return cmd_trace(argc, argv);