diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:48:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:48:59 +0100 |
| commit | b3890e4704594fa23abe1395d1fafc97d3214be8 (patch) | |
| tree | 23e2659713e01779e8854363eb7d1fac49683d32 /tools/perf/util/parse-events.h | |
| parent | 29bf4dbc9841366577ba44175b00c543ad1712d6 (diff) | |
| parent | 2a2662bf88e693d477ef08351d03934f7bc0b51c (diff) | |
Merge branch 'perf/hw_breakpoints' into perf/core
The new hw_breakpoint bits are now ready for v3.20, merge them
into the main branch, to avoid conflicts.
Conflicts:
tools/perf/Documentation/perf-record.txt
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/parse-events.h')
| -rw-r--r-- | tools/perf/util/parse-events.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index ca226cef846..ff6e1fa4111 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -105,7 +105,7 @@ int parse_events_add_numeric(struct list_head *list, int *idx, int parse_events_add_cache(struct list_head *list, int *idx, char *type, char *op_result1, char *op_result2); int parse_events_add_breakpoint(struct list_head *list, int *idx, - void *ptr, char *type); + void *ptr, char *type, u64 len); int parse_events_add_pmu(struct list_head *list, int *idx, char *pmu , struct list_head *head_config); enum perf_pmu_event_symbol_type |