diff options
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/ftrace.h | 12 | ||||
-rw-r--r-- | include/trace/syscall.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 73523151a731..2fdd36df41f6 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
@@ -498,7 +498,7 @@ static inline int ftrace_get_offsets_##call( \ | |||
498 | 498 | ||
499 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 499 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
500 | 500 | ||
501 | #ifdef CONFIG_EVENT_PROFILE | 501 | #ifdef CONFIG_PERF_EVENTS |
502 | 502 | ||
503 | /* | 503 | /* |
504 | * Generate the functions needed for tracepoint perf_event support. | 504 | * Generate the functions needed for tracepoint perf_event support. |
@@ -541,7 +541,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\ | |||
541 | 541 | ||
542 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 542 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
543 | 543 | ||
544 | #endif | 544 | #endif /* CONFIG_PERF_EVENTS */ |
545 | 545 | ||
546 | /* | 546 | /* |
547 | * Stage 4 of the trace events. | 547 | * Stage 4 of the trace events. |
@@ -626,7 +626,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\ | |||
626 | * | 626 | * |
627 | */ | 627 | */ |
628 | 628 | ||
629 | #ifdef CONFIG_EVENT_PROFILE | 629 | #ifdef CONFIG_PERF_EVENTS |
630 | 630 | ||
631 | #define _TRACE_PROFILE_INIT(call) \ | 631 | #define _TRACE_PROFILE_INIT(call) \ |
632 | .profile_enable = ftrace_profile_enable_##call, \ | 632 | .profile_enable = ftrace_profile_enable_##call, \ |
@@ -634,7 +634,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\ | |||
634 | 634 | ||
635 | #else | 635 | #else |
636 | #define _TRACE_PROFILE_INIT(call) | 636 | #define _TRACE_PROFILE_INIT(call) |
637 | #endif | 637 | #endif /* CONFIG_PERF_EVENTS */ |
638 | 638 | ||
639 | #undef __entry | 639 | #undef __entry |
640 | #define __entry entry | 640 | #define __entry entry |
@@ -834,7 +834,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ | |||
834 | * } | 834 | * } |
835 | */ | 835 | */ |
836 | 836 | ||
837 | #ifdef CONFIG_EVENT_PROFILE | 837 | #ifdef CONFIG_PERF_EVENTS |
838 | 838 | ||
839 | #undef __perf_addr | 839 | #undef __perf_addr |
840 | #define __perf_addr(a) __addr = (a) | 840 | #define __perf_addr(a) __addr = (a) |
@@ -926,7 +926,7 @@ static void ftrace_profile_##call(proto) \ | |||
926 | DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args)) | 926 | DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args)) |
927 | 927 | ||
928 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 928 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
929 | #endif /* CONFIG_EVENT_PROFILE */ | 929 | #endif /* CONFIG_PERF_EVENTS */ |
930 | 930 | ||
931 | #undef _TRACE_PROFILE_INIT | 931 | #undef _TRACE_PROFILE_INIT |
932 | 932 | ||
diff --git a/include/trace/syscall.h b/include/trace/syscall.h index 961fda3556bb..3d463dcef298 100644 --- a/include/trace/syscall.h +++ b/include/trace/syscall.h | |||
@@ -49,12 +49,12 @@ ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s); | |||
49 | enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags); | 49 | enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags); |
50 | enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags); | 50 | enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags); |
51 | #endif | 51 | #endif |
52 | #ifdef CONFIG_EVENT_PROFILE | 52 | |
53 | #ifdef CONFIG_PERF_EVENTS | ||
53 | int prof_sysenter_enable(struct ftrace_event_call *call); | 54 | int prof_sysenter_enable(struct ftrace_event_call *call); |
54 | void prof_sysenter_disable(struct ftrace_event_call *call); | 55 | void prof_sysenter_disable(struct ftrace_event_call *call); |
55 | int prof_sysexit_enable(struct ftrace_event_call *call); | 56 | int prof_sysexit_enable(struct ftrace_event_call *call); |
56 | void prof_sysexit_disable(struct ftrace_event_call *call); | 57 | void prof_sysexit_disable(struct ftrace_event_call *call); |
57 | |||
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | #endif /* _TRACE_SYSCALL_H */ | 60 | #endif /* _TRACE_SYSCALL_H */ |