Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Fixes and improvements for perf/core:

- perf_target: abstraction for --uid, --pid, --tid, --cpu, --all-cpus handling,
  eliminating code duplicated in the tools, having constraints that apply to
  all of them, from Namhyung Kim

- Fixes for handling fallback to cpu-clock on PPC, from David Ahern

- Fix for processing events with unknown size, from Jiri Olsa

- Compilation fix on 32-bit, from Jiri Olsa

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 89e3355ab173..14f1034f14f9 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -207,10 +207,10 @@ extern const char perf_version_string[];
 
 void pthread__unblock_sigwinch(void);
 
+#include "util/target.h"
+
 struct perf_record_opts {
-        const char   *target_pid;
-        const char   *target_tid;
-        uid_t        uid;
+        struct perf_target target;
         bool         call_graph;
         bool         group;
         bool         inherit_stat;
@@ -223,7 +223,6 @@ struct perf_record_opts {
         bool         sample_time;
         bool         sample_id_all_missing;
         bool         exclude_guest_missing;
-        bool         system_wide;
         bool         period;
         unsigned int freq;
         unsigned int mmap_pages;
@@ -231,7 +230,6 @@ struct perf_record_opts {
         int          branch_stack;
         u64          default_interval;
         u64          user_interval;
-        const char   *cpu_list;
 };
 
 #endif