aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-12-21 01:27:35 -0500
committerIngo Molnar <mingo@elte.hu>2009-12-28 04:33:06 -0500
commit07b139c8c81b97bbe55c68daf0cbeca8b1c609ca (patch)
treeea410cac398bef3cc6cc7e2d2dc3527b50aac6d1 /include
parent659d8cfbb225f1fa5a4f8671a847ef3ab5a89660 (diff)
perf events: Remove CONFIG_EVENT_PROFILE
Quoted from Ingo: | This reminds me - i think we should eliminate CONFIG_EVENT_PROFILE - | it's an unnecessary Kconfig complication. If both PERF_EVENTS and | EVENT_TRACING is enabled we should expose generic tracepoints. | | Nor is it limited to event 'profiling', so it has become a misnomer as | well. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <4B2F1557.2050705@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ftrace_event.h2
-rw-r--r--include/linux/perf_event.h2
-rw-r--r--include/linux/syscalls.h4
-rw-r--r--include/trace/ftrace.h12
-rw-r--r--include/trace/syscall.h4
5 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 2233c98d80df..0a09e758c7d3 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -188,7 +188,7 @@ do { \
188 __trace_printk(ip, fmt, ##args); \ 188 __trace_printk(ip, fmt, ##args); \
189} while (0) 189} while (0)
190 190
191#ifdef CONFIG_EVENT_PROFILE 191#ifdef CONFIG_PERF_EVENTS
192struct perf_event; 192struct perf_event;
193extern int ftrace_profile_enable(int event_id); 193extern int ftrace_profile_enable(int event_id);
194extern void ftrace_profile_disable(int event_id); 194extern void ftrace_profile_disable(int event_id);
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index a494e7501292..9a1d276db754 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -658,7 +658,7 @@ struct perf_event {
658 658
659 perf_overflow_handler_t overflow_handler; 659 perf_overflow_handler_t overflow_handler;
660 660
661#ifdef CONFIG_EVENT_PROFILE 661#ifdef CONFIG_EVENT_TRACING
662 struct event_filter *filter; 662 struct event_filter *filter;
663#endif 663#endif
664 664
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 65793e90d6f6..b7c7fcf7790b 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -99,7 +99,7 @@ struct perf_event_attr;
99#define __SC_TEST5(t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__) 99#define __SC_TEST5(t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__)
100#define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__) 100#define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)
101 101
102#ifdef CONFIG_EVENT_PROFILE 102#ifdef CONFIG_PERF_EVENTS
103 103
104#define TRACE_SYS_ENTER_PROFILE_INIT(sname) \ 104#define TRACE_SYS_ENTER_PROFILE_INIT(sname) \
105 .profile_enable = prof_sysenter_enable, \ 105 .profile_enable = prof_sysenter_enable, \
@@ -113,7 +113,7 @@ struct perf_event_attr;
113#define TRACE_SYS_ENTER_PROFILE_INIT(sname) 113#define TRACE_SYS_ENTER_PROFILE_INIT(sname)
114#define TRACE_SYS_EXIT_PROFILE(sname) 114#define TRACE_SYS_EXIT_PROFILE(sname)
115#define TRACE_SYS_EXIT_PROFILE_INIT(sname) 115#define TRACE_SYS_EXIT_PROFILE_INIT(sname)
116#endif 116#endif /* CONFIG_PERF_EVENTS */
117 117
118#ifdef CONFIG_FTRACE_SYSCALLS 118#ifdef CONFIG_FTRACE_SYSCALLS
119#define __SC_STR_ADECL1(t, a) #a 119#define __SC_STR_ADECL1(t, a) #a
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);
49enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags); 49enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags);
50enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags); 50enum 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
53int prof_sysenter_enable(struct ftrace_event_call *call); 54int prof_sysenter_enable(struct ftrace_event_call *call);
54void prof_sysenter_disable(struct ftrace_event_call *call); 55void prof_sysenter_disable(struct ftrace_event_call *call);
55int prof_sysexit_enable(struct ftrace_event_call *call); 56int prof_sysexit_enable(struct ftrace_event_call *call);
56void prof_sysexit_disable(struct ftrace_event_call *call); 57void 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 */