diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-22 09:33:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-22 09:33:46 +0200 |
| commit | 4ba792e303e278052bb0ee60cce15d6d7dc15c7c (patch) | |
| tree | c9e034f488a2194af1e956a217b26120b6844835 /tools/perf/util/evsel.c | |
| parent | 43e41adc9e8c36545888d78fed2ef8d102a938dc (diff) | |
| parent | e3d006ce8180a0c025ce66bdc89bbc125f85be57 (diff) | |
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:
User visible changes:
- Print branch filter state in verbose mode. (Andi Kleen)
- Fix core dump caused by per-socket/core system-wide stat. (Kan Liang)
- Update libtraceevent KVM plugin. (Paolo Bonzini)
Infrastructure changes:
- Add fixdep to 'tools/build' .gitignore. (Yunlong Song)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/evsel.c')
| -rw-r--r-- | tools/perf/util/evsel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 8be867ccefe9..ab05fa52a5cd 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1262,6 +1262,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, PRINT_ATTRf(bp_type, p_unsigned); PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex); PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex); + PRINT_ATTRf(branch_sample_type, p_unsigned); PRINT_ATTRf(sample_regs_user, p_hex); PRINT_ATTRf(sample_stack_user, p_unsigned); PRINT_ATTRf(clockid, p_signed); |