diff options
Diffstat (limited to 'include/trace/ftrace.h')
-rw-r--r-- | include/trace/ftrace.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 7dcdfd824aab..ba28b644f41b 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
@@ -406,18 +406,18 @@ static inline notrace int ftrace_get_offsets_##call( \ | |||
406 | #undef DEFINE_EVENT | 406 | #undef DEFINE_EVENT |
407 | #define DEFINE_EVENT(template, name, proto, args) \ | 407 | #define DEFINE_EVENT(template, name, proto, args) \ |
408 | \ | 408 | \ |
409 | static void perf_trace_##name(proto); \ | 409 | static void perf_trace_##name(void *, proto); \ |
410 | \ | 410 | \ |
411 | static notrace int \ | 411 | static notrace int \ |
412 | perf_trace_enable_##name(struct ftrace_event_call *unused) \ | 412 | perf_trace_enable_##name(struct ftrace_event_call *unused) \ |
413 | { \ | 413 | { \ |
414 | return register_trace_##name(perf_trace_##name); \ | 414 | return register_trace_##name(perf_trace_##name, NULL); \ |
415 | } \ | 415 | } \ |
416 | \ | 416 | \ |
417 | static notrace void \ | 417 | static notrace void \ |
418 | perf_trace_disable_##name(struct ftrace_event_call *unused) \ | 418 | perf_trace_disable_##name(struct ftrace_event_call *unused) \ |
419 | { \ | 419 | { \ |
420 | unregister_trace_##name(perf_trace_##name); \ | 420 | unregister_trace_##name(perf_trace_##name, NULL); \ |
421 | } | 421 | } |
422 | 422 | ||
423 | #undef DEFINE_EVENT_PRINT | 423 | #undef DEFINE_EVENT_PRINT |
@@ -578,7 +578,7 @@ ftrace_raw_event_id_##call(struct ftrace_event_call *event_call, \ | |||
578 | #undef DEFINE_EVENT | 578 | #undef DEFINE_EVENT |
579 | #define DEFINE_EVENT(template, call, proto, args) \ | 579 | #define DEFINE_EVENT(template, call, proto, args) \ |
580 | \ | 580 | \ |
581 | static notrace void ftrace_raw_event_##call(proto) \ | 581 | static notrace void ftrace_raw_event_##call(void *__ignore, proto) \ |
582 | { \ | 582 | { \ |
583 | ftrace_raw_event_id_##template(&event_##call, args); \ | 583 | ftrace_raw_event_id_##template(&event_##call, args); \ |
584 | } \ | 584 | } \ |
@@ -586,13 +586,13 @@ static notrace void ftrace_raw_event_##call(proto) \ | |||
586 | static notrace int \ | 586 | static notrace int \ |
587 | ftrace_raw_reg_event_##call(struct ftrace_event_call *unused) \ | 587 | ftrace_raw_reg_event_##call(struct ftrace_event_call *unused) \ |
588 | { \ | 588 | { \ |
589 | return register_trace_##call(ftrace_raw_event_##call); \ | 589 | return register_trace_##call(ftrace_raw_event_##call, NULL); \ |
590 | } \ | 590 | } \ |
591 | \ | 591 | \ |
592 | static notrace void \ | 592 | static notrace void \ |
593 | ftrace_raw_unreg_event_##call(struct ftrace_event_call *unused) \ | 593 | ftrace_raw_unreg_event_##call(struct ftrace_event_call *unused) \ |
594 | { \ | 594 | { \ |
595 | unregister_trace_##call(ftrace_raw_event_##call); \ | 595 | unregister_trace_##call(ftrace_raw_event_##call, NULL); \ |
596 | } \ | 596 | } \ |
597 | \ | 597 | \ |
598 | static struct trace_event ftrace_event_type_##call = { \ | 598 | static struct trace_event ftrace_event_type_##call = { \ |
@@ -793,7 +793,7 @@ perf_trace_templ_##call(struct ftrace_event_call *event_call, \ | |||
793 | 793 | ||
794 | #undef DEFINE_EVENT | 794 | #undef DEFINE_EVENT |
795 | #define DEFINE_EVENT(template, call, proto, args) \ | 795 | #define DEFINE_EVENT(template, call, proto, args) \ |
796 | static notrace void perf_trace_##call(proto) \ | 796 | static notrace void perf_trace_##call(void *__ignore, proto) \ |
797 | { \ | 797 | { \ |
798 | struct ftrace_event_call *event_call = &event_##call; \ | 798 | struct ftrace_event_call *event_call = &event_##call; \ |
799 | \ | 799 | \ |