diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:02:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:02:59 -0700 |
| commit | 55bcab46955644d5a8149a9b3cc9752a336e02f8 (patch) | |
| tree | a45593603de9265cb0624043ab36f4e0f98823fc /tools/perf/perf.h | |
| parent | 58580c86450bc09ff101f0d23fd8a162c146bc64 (diff) | |
| parent | 7bec7a9134c25cecb0d7029199b59f7b1bef35b8 (diff) | |
| download | kernel-crypto-55bcab46955644d5a8149a9b3cc9752a336e02f8.tar.gz kernel-crypto-55bcab46955644d5a8149a9b3cc9752a336e02f8.tar.xz kernel-crypto-55bcab46955644d5a8149a9b3cc9752a336e02f8.zip | |
Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (47 commits)
perf report: Add --symbols parameter
perf report: Add --comms parameter
perf report: Add --dsos parameter
perf_counter tools: Adjust only prelinked symbol's addresses
perf_counter: Provide a way to enable counters on exec
perf_counter tools: Reduce perf stat measurement overhead/skew
perf stat: Use percentages for scaling output
perf_counter, x86: Update x86_pmu after WARN()
perf stat: Micro-optimize the code: memcpy is only required if no event is selected and !null_run
perf stat: Improve output
perf stat: Fix multi-run stats
perf stat: Add -n/--null option to run without counters
perf_counter tools: Remove dead code
perf_counter: Complete counter swap
perf report: Print sorted callchains per histogram entries
perf_counter tools: Prepare a small callchain framework
perf record: Fix unhandled io return value
perf_counter tools: Add alias for 'l1d' and 'l1i'
perf-report: Add bare minimum PERF_EVENT_READ parsing
perf-report: Add modes for inherited stats and no-samples
...
Diffstat (limited to 'tools/perf/perf.h')
| -rw-r--r-- | tools/perf/perf.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index ceb68aa51f7..ce394192c85 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -25,7 +25,7 @@ #include <sys/syscall.h> #include "../../include/linux/perf_counter.h" -#include "types.h" +#include "util/types.h" /* * prctl(PR_TASK_PERF_COUNTERS_DISABLE) will (cheaply) disable all @@ -72,10 +72,9 @@ sys_perf_counter_open(struct perf_counter_attr *attr, #define MAX_COUNTERS 256 #define MAX_NR_CPUS 256 -struct perf_file_header { - u64 version; - u64 sample_type; - u64 data_size; +struct ip_callchain { + u64 nr; + u64 ips[0]; }; #endif |