diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:18:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:18:41 +0100 |
| commit | adc1ef1e37358d3c17d1a74a58b2e104fc0bda15 (patch) | |
| tree | 6f43107a76ed87f2b817594d2d62246ab82cfba6 /tools/perf/perf.h | |
| parent | 84e53ff77cb1e005f49966cd6789109d84acc9e2 (diff) | |
| parent | 07ac002f2fcc74c5be47b656d9201d5de84dc53d (diff) | |
| download | op-kernel-dev-adc1ef1e37358d3c17d1a74a58b2e104fc0bda15.zip op-kernel-dev-adc1ef1e37358d3c17d1a74a58b2e104fc0bda15.tar.gz | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
- UAPI fixes, from David Howels
- Separate perf tests into multiple objects, one per test, from Jiri Olsa.
- Fixes to /proc/pid/maps parsing, preparatory to supporting data maps,
from Namhyung Kim
- Fix compile error for non-NEWT builds, from Namhyung Kim
- Implement ui_progress for GTK, from Namhyung Kim
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/perf.h')
| -rw-r--r-- | tools/perf/perf.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 054182e..f53ee0b 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -26,7 +26,7 @@ void get_term_dimensions(struct winsize *ws); #endif #ifdef __powerpc__ -#include "../../arch/powerpc/include/asm/unistd.h" +#include "../../arch/powerpc/include/uapi/asm/unistd.h" #define rmb() asm volatile ("sync" ::: "memory") #define cpu_relax() asm volatile ("" ::: "memory"); #define CPUINFO_PROC "cpu" @@ -178,7 +178,6 @@ extern bool test_attr__enabled; void test_attr__init(void); void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu, int fd, int group_fd, unsigned long flags); -int test_attr__run(void); static inline int sys_perf_event_open(struct perf_event_attr *attr, |
