Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
 "This tree includes some late late perf items that missed the first
  round:

  tools:

   - Bash auto completion improvements, now we can auto complete the
     tools long options, tracepoint event names, etc, from Namhyung Kim.

   - Look up thread using tid instead of pid in 'perf sched'.

   - Move global variables into a perf_kvm struct, from David Ahern.

   - Hists refactorings, preparatory for improved 'diff' command, from
     Jiri Olsa.

   - Hists refactorings, preparatory for event group viewieng work, from
     Namhyung Kim.

   - Remove double negation on optional feature macro definitions, from
     Namhyung Kim.

   - Remove several cases of needless global variables, on most
     builtins.

   - misc fixes

  kernel:

   - sysfs support for IBS on AMD CPUs, from Robert Richter.

   - Support for an upcoming Intel CPU, the Xeon-Phi / Knights Corner
     HPC blade PMU, from Vince Weaver.

   - misc fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  perf: Fix perf_cgroup_switch for sw-events
  perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
  perf/AMD/IBS: Add sysfs support
  perf hists: Add more helpers for hist entry stat
  perf hists: Move he->stat.nr_events initialization to a template
  perf hists: Introduce struct he_stat
  perf diff: Removing the total_period argument from output code
  perf tool: Add hpp interface to enable/disable hpp column
  perf tools: Removing hists pair argument from output path
  perf hists: Separate overhead and baseline columns
  perf diff: Refactor diff displacement possition info
  perf hists: Add struct hists pointer to struct hist_entry
  perf tools: Complete tracepoint event names
  perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU
  perf evlist: Remove some unused methods
  perf evlist: Introduce add_newtp method
  perf kvm: Move global variables into a perf_kvm struct
  perf tools: Convert to BACKTRACE_SUPPORT
  perf tools: Long option completion support for each subcommands
  perf tools: Complete long option names of perf command
  ...

1 files changed, 39 insertions, 51 deletions

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 7d6e09949880..6f5f328157aa 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -823,12 +823,6 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused,
         return 0;
 }
 
-static struct perf_tool eops = {
-        .sample                 = process_sample_event,
-        .comm                   = perf_event__process_comm,
-        .ordered_samples        = true,
-};
-
 static const struct perf_evsel_str_handler lock_tracepoints[] = {
         { "lock:lock_acquire",   perf_evsel__process_lock_acquire,   }, /* CONFIG_LOCKDEP */
         { "lock:lock_acquired",  perf_evsel__process_lock_acquired,  }, /* CONFIG_LOCKDEP, CONFIG_LOCK_STAT */
@@ -838,6 +832,11 @@ static const struct perf_evsel_str_handler lock_tracepoints[] = {
 
 static int read_events(void)
 {
+        struct perf_tool eops = {
+                .sample          = process_sample_event,
+                .comm            = perf_event__process_comm,
+                .ordered_samples = true,
+        };
         session = perf_session__new(input_name, O_RDONLY, 0, false, &eops);
         if (!session) {
                 pr_err("Initializing perf session failed\n");
@@ -878,53 +877,11 @@ static int __cmd_report(void)
         return 0;
 }
 
-static const char * const report_usage[] = {
-        "perf lock report [<options>]",
-        NULL
-};
-
-static const struct option report_options[] = {
-        OPT_STRING('k', "key", &sort_key, "acquired",
-                    "key for sorting (acquired / contended / wait_total / wait_max / wait_min)"),
-        /* TODO: type */
-        OPT_END()
-};
-
-static const char * const info_usage[] = {
-        "perf lock info [<options>]",
-        NULL
-};
-
-static const struct option info_options[] = {
-        OPT_BOOLEAN('t', "threads", &info_threads,
-                    "dump thread list in perf.data"),
-        OPT_BOOLEAN('m', "map", &info_map,
-                    "map of lock instances (address:name table)"),
-        OPT_END()
-};
-
-static const char * const lock_usage[] = {
-        "perf lock [<options>] {record|report|script|info}",
-        NULL
-};
-
-static const struct option lock_options[] = {
-        OPT_STRING('i', "input", &input_name, "file", "input file name"),
-        OPT_INCR('v', "verbose", &verbose, "be more verbose (show symbol address, etc)"),
-        OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"),
-        OPT_END()
-};
-
-static const char *record_args[] = {
-        "record",
-        "-R",
-        "-f",
-        "-m", "1024",
-        "-c", "1",
-};
-
 static int __cmd_record(int argc, const char **argv)
 {
+        const char *record_args[] = {
+                "record", "-R", "-f", "-m", "1024", "-c", "1",
+        };
         unsigned int rec_argc, i, j;
         const char **rec_argv;
 
@@ -963,6 +920,37 @@ static int __cmd_record(int argc, const char **argv)
 
 int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
 {
+        const struct option info_options[] = {
+        OPT_BOOLEAN('t', "threads", &info_threads,
+                    "dump thread list in perf.data"),
+        OPT_BOOLEAN('m', "map", &info_map,
+                    "map of lock instances (address:name table)"),
+        OPT_END()
+        };
+        const struct option lock_options[] = {
+        OPT_STRING('i', "input", &input_name, "file", "input file name"),
+        OPT_INCR('v', "verbose", &verbose, "be more verbose (show symbol address, etc)"),
+        OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"),
+        OPT_END()
+        };
+        const struct option report_options[] = {
+        OPT_STRING('k', "key", &sort_key, "acquired",
+                    "key for sorting (acquired / contended / wait_total / wait_max / wait_min)"),
+        /* TODO: type */
+        OPT_END()
+        };
+        const char * const info_usage[] = {
+                "perf lock info [<options>]",
+                NULL
+        };
+        const char * const lock_usage[] = {
+                "perf lock [<options>] {record|report|script|info}",
+                NULL
+        };
+        const char * const report_usage[] = {
+                "perf lock report [<options>]",
+                NULL
+        };
         unsigned int i;
         int rc = 0;