diff options
Diffstat (limited to 'tools/perf/builtin-lock.c')
-rw-r--r-- | tools/perf/builtin-lock.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 12c814838993..fd53319de20d 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c | |||
@@ -356,25 +356,25 @@ struct trace_release_event { | |||
356 | 356 | ||
357 | struct trace_lock_handler { | 357 | struct trace_lock_handler { |
358 | void (*acquire_event)(struct trace_acquire_event *, | 358 | void (*acquire_event)(struct trace_acquire_event *, |
359 | struct event *, | 359 | struct event_format *, |
360 | int cpu, | 360 | int cpu, |
361 | u64 timestamp, | 361 | u64 timestamp, |
362 | struct thread *thread); | 362 | struct thread *thread); |
363 | 363 | ||
364 | void (*acquired_event)(struct trace_acquired_event *, | 364 | void (*acquired_event)(struct trace_acquired_event *, |
365 | struct event *, | 365 | struct event_format *, |
366 | int cpu, | 366 | int cpu, |
367 | u64 timestamp, | 367 | u64 timestamp, |
368 | struct thread *thread); | 368 | struct thread *thread); |
369 | 369 | ||
370 | void (*contended_event)(struct trace_contended_event *, | 370 | void (*contended_event)(struct trace_contended_event *, |
371 | struct event *, | 371 | struct event_format *, |
372 | int cpu, | 372 | int cpu, |
373 | u64 timestamp, | 373 | u64 timestamp, |
374 | struct thread *thread); | 374 | struct thread *thread); |
375 | 375 | ||
376 | void (*release_event)(struct trace_release_event *, | 376 | void (*release_event)(struct trace_release_event *, |
377 | struct event *, | 377 | struct event_format *, |
378 | int cpu, | 378 | int cpu, |
379 | u64 timestamp, | 379 | u64 timestamp, |
380 | struct thread *thread); | 380 | struct thread *thread); |
@@ -416,7 +416,7 @@ enum acquire_flags { | |||
416 | 416 | ||
417 | static void | 417 | static void |
418 | report_lock_acquire_event(struct trace_acquire_event *acquire_event, | 418 | report_lock_acquire_event(struct trace_acquire_event *acquire_event, |
419 | struct event *__event __used, | 419 | struct event_format *__event __used, |
420 | int cpu __used, | 420 | int cpu __used, |
421 | u64 timestamp __used, | 421 | u64 timestamp __used, |
422 | struct thread *thread __used) | 422 | struct thread *thread __used) |
@@ -480,7 +480,7 @@ end: | |||
480 | 480 | ||
481 | static void | 481 | static void |
482 | report_lock_acquired_event(struct trace_acquired_event *acquired_event, | 482 | report_lock_acquired_event(struct trace_acquired_event *acquired_event, |
483 | struct event *__event __used, | 483 | struct event_format *__event __used, |
484 | int cpu __used, | 484 | int cpu __used, |
485 | u64 timestamp __used, | 485 | u64 timestamp __used, |
486 | struct thread *thread __used) | 486 | struct thread *thread __used) |
@@ -536,7 +536,7 @@ end: | |||
536 | 536 | ||
537 | static void | 537 | static void |
538 | report_lock_contended_event(struct trace_contended_event *contended_event, | 538 | report_lock_contended_event(struct trace_contended_event *contended_event, |
539 | struct event *__event __used, | 539 | struct event_format *__event __used, |
540 | int cpu __used, | 540 | int cpu __used, |
541 | u64 timestamp __used, | 541 | u64 timestamp __used, |
542 | struct thread *thread __used) | 542 | struct thread *thread __used) |
@@ -583,7 +583,7 @@ end: | |||
583 | 583 | ||
584 | static void | 584 | static void |
585 | report_lock_release_event(struct trace_release_event *release_event, | 585 | report_lock_release_event(struct trace_release_event *release_event, |
586 | struct event *__event __used, | 586 | struct event_format *__event __used, |
587 | int cpu __used, | 587 | int cpu __used, |
588 | u64 timestamp __used, | 588 | u64 timestamp __used, |
589 | struct thread *thread __used) | 589 | struct thread *thread __used) |
@@ -647,7 +647,7 @@ static struct trace_lock_handler *trace_handler; | |||
647 | 647 | ||
648 | static void | 648 | static void |
649 | process_lock_acquire_event(void *data, | 649 | process_lock_acquire_event(void *data, |
650 | struct event *event __used, | 650 | struct event_format *event __used, |
651 | int cpu __used, | 651 | int cpu __used, |
652 | u64 timestamp __used, | 652 | u64 timestamp __used, |
653 | struct thread *thread __used) | 653 | struct thread *thread __used) |
@@ -666,7 +666,7 @@ process_lock_acquire_event(void *data, | |||
666 | 666 | ||
667 | static void | 667 | static void |
668 | process_lock_acquired_event(void *data, | 668 | process_lock_acquired_event(void *data, |
669 | struct event *event __used, | 669 | struct event_format *event __used, |
670 | int cpu __used, | 670 | int cpu __used, |
671 | u64 timestamp __used, | 671 | u64 timestamp __used, |
672 | struct thread *thread __used) | 672 | struct thread *thread __used) |
@@ -684,7 +684,7 @@ process_lock_acquired_event(void *data, | |||
684 | 684 | ||
685 | static void | 685 | static void |
686 | process_lock_contended_event(void *data, | 686 | process_lock_contended_event(void *data, |
687 | struct event *event __used, | 687 | struct event_format *event __used, |
688 | int cpu __used, | 688 | int cpu __used, |
689 | u64 timestamp __used, | 689 | u64 timestamp __used, |
690 | struct thread *thread __used) | 690 | struct thread *thread __used) |
@@ -702,7 +702,7 @@ process_lock_contended_event(void *data, | |||
702 | 702 | ||
703 | static void | 703 | static void |
704 | process_lock_release_event(void *data, | 704 | process_lock_release_event(void *data, |
705 | struct event *event __used, | 705 | struct event_format *event __used, |
706 | int cpu __used, | 706 | int cpu __used, |
707 | u64 timestamp __used, | 707 | u64 timestamp __used, |
708 | struct thread *thread __used) | 708 | struct thread *thread __used) |
@@ -721,7 +721,7 @@ process_lock_release_event(void *data, | |||
721 | static void | 721 | static void |
722 | process_raw_event(void *data, int cpu, u64 timestamp, struct thread *thread) | 722 | process_raw_event(void *data, int cpu, u64 timestamp, struct thread *thread) |
723 | { | 723 | { |
724 | struct event *event; | 724 | struct event_format *event; |
725 | int type; | 725 | int type; |
726 | 726 | ||
727 | type = trace_parse_common_type(data); | 727 | type = trace_parse_common_type(data); |