git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
tools
/
perf
/
util
/
evsel.h
diff --git
a/tools/perf/util/evsel.h
b/tools/perf/util/evsel.h
index 351d3b2d8887fb800cb7bd7f39a753efaee46eae..dd2c4b5112a561b846053719262ce967cd383e16 100644
(file)
--- a/
tools/perf/util/evsel.h
+++ b/
tools/perf/util/evsel.h
@@
-131,6
+131,7
@@
struct perf_evsel {
bool cmdline_group_boundary;
struct list_head config_terms;
int bpf_fd;
+ bool auto_merge_stats;
bool merged_stat;
const char * metric_expr;
const char * metric_name;