diff options
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r-- | tools/perf/builtin-script.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 9708a1290571..ce304dfd962a 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
@@ -23,7 +23,6 @@ static char const *generate_script_lang; | |||
23 | static bool debug_mode; | 23 | static bool debug_mode; |
24 | static u64 last_timestamp; | 24 | static u64 last_timestamp; |
25 | static u64 nr_unordered; | 25 | static u64 nr_unordered; |
26 | extern const struct option record_options[]; | ||
27 | static bool no_callchain; | 26 | static bool no_callchain; |
28 | static bool latency_format; | 27 | static bool latency_format; |
29 | static bool system_wide; | 28 | static bool system_wide; |
@@ -379,7 +378,6 @@ static void print_sample_start(struct perf_sample *sample, | |||
379 | 378 | ||
380 | static void print_sample_addr(union perf_event *event, | 379 | static void print_sample_addr(union perf_event *event, |
381 | struct perf_sample *sample, | 380 | struct perf_sample *sample, |
382 | struct machine *machine, | ||
383 | struct thread *thread, | 381 | struct thread *thread, |
384 | struct perf_event_attr *attr) | 382 | struct perf_event_attr *attr) |
385 | { | 383 | { |
@@ -390,7 +388,7 @@ static void print_sample_addr(union perf_event *event, | |||
390 | if (!sample_addr_correlates_sym(attr)) | 388 | if (!sample_addr_correlates_sym(attr)) |
391 | return; | 389 | return; |
392 | 390 | ||
393 | perf_event__preprocess_sample_addr(event, sample, machine, thread, &al); | 391 | perf_event__preprocess_sample_addr(event, sample, thread, &al); |
394 | 392 | ||
395 | if (PRINT_FIELD(SYM)) { | 393 | if (PRINT_FIELD(SYM)) { |
396 | printf(" "); | 394 | printf(" "); |
@@ -438,7 +436,7 @@ static void print_sample_bts(union perf_event *event, | |||
438 | ((evsel->attr.sample_type & PERF_SAMPLE_ADDR) && | 436 | ((evsel->attr.sample_type & PERF_SAMPLE_ADDR) && |
439 | !output[attr->type].user_set)) { | 437 | !output[attr->type].user_set)) { |
440 | printf(" => "); | 438 | printf(" => "); |
441 | print_sample_addr(event, sample, al->machine, thread, attr); | 439 | print_sample_addr(event, sample, thread, attr); |
442 | } | 440 | } |
443 | 441 | ||
444 | if (print_srcline_last) | 442 | if (print_srcline_last) |
@@ -475,7 +473,7 @@ static void process_event(union perf_event *event, struct perf_sample *sample, | |||
475 | event_format__print(evsel->tp_format, sample->cpu, | 473 | event_format__print(evsel->tp_format, sample->cpu, |
476 | sample->raw_data, sample->raw_size); | 474 | sample->raw_data, sample->raw_size); |
477 | if (PRINT_FIELD(ADDR)) | 475 | if (PRINT_FIELD(ADDR)) |
478 | print_sample_addr(event, sample, al->machine, thread, attr); | 476 | print_sample_addr(event, sample, thread, attr); |
479 | 477 | ||
480 | if (PRINT_FIELD(IP)) { | 478 | if (PRINT_FIELD(IP)) { |
481 | if (!symbol_conf.use_callchain) | 479 | if (!symbol_conf.use_callchain) |