diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-11 02:13:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-11 02:13:55 -0400 |
commit | 5dcefda0fd87fefa440abc9b9d3f1089229f8911 (patch) | |
tree | f19697dc461b40e277109fbba659d614892bb0d2 /tools/perf/util/util.h | |
parent | c4f400e837713f677de94390c57e7dc7567e0286 (diff) | |
parent | 5a5626b1b4bf8467891c9297ffda979db97ed5ec (diff) |
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>
Diffstat (limited to 'tools/perf/util/util.h')
-rw-r--r-- | tools/perf/util/util.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 6121e24fefc0..2daaedb83d84 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h | |||
@@ -74,7 +74,6 @@ | |||
74 | #include <netinet/tcp.h> | 74 | #include <netinet/tcp.h> |
75 | #include <arpa/inet.h> | 75 | #include <arpa/inet.h> |
76 | #include <netdb.h> | 76 | #include <netdb.h> |
77 | #include <pwd.h> | ||
78 | #include <inttypes.h> | 77 | #include <inttypes.h> |
79 | #include "../../../include/linux/magic.h" | 78 | #include "../../../include/linux/magic.h" |
80 | #include "types.h" | 79 | #include "types.h" |
@@ -249,8 +248,6 @@ struct perf_event_attr; | |||
249 | 248 | ||
250 | void event_attr_init(struct perf_event_attr *attr); | 249 | void event_attr_init(struct perf_event_attr *attr); |
251 | 250 | ||
252 | uid_t parse_target_uid(const char *str, const char *tid, const char *pid); | ||
253 | |||
254 | #define _STR(x) #x | 251 | #define _STR(x) #x |
255 | #define STR(x) _STR(x) | 252 | #define STR(x) _STR(x) |
256 | 253 | ||