Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07b139c8 authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

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: default avatarLi 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: default avatarIngo Molnar <mingo@elte.hu>
parent 659d8cfb

include/linux/ftrace_event.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ do { \ 
		__trace_printk(ip, fmt, ##args);			\

} while (0)



#ifdef CONFIG_EVENT_PROFILE

#ifdef CONFIG_PERF_EVENTS

struct perf_event;

extern int ftrace_profile_enable(int event_id);

extern void ftrace_profile_disable(int event_id);

include/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ struct perf_event { 


	perf_overflow_handler_t		overflow_handler;



#ifdef CONFIG_EVENT_PROFILE

#ifdef CONFIG_EVENT_TRACING

	struct event_filter		*filter;

#endif

include/linux/syscalls.h

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct perf_event_attr; 
#define __SC_TEST5(t5, a5, ...)	__SC_TEST(t5); __SC_TEST4(__VA_ARGS__)

#define __SC_TEST6(t6, a6, ...)	__SC_TEST(t6); __SC_TEST5(__VA_ARGS__)



#ifdef CONFIG_EVENT_PROFILE

#ifdef CONFIG_PERF_EVENTS



#define TRACE_SYS_ENTER_PROFILE_INIT(sname)				       \

	.profile_enable = prof_sysenter_enable,				       \
@@ -113,7 +113,7 @@ struct perf_event_attr; 
#define TRACE_SYS_ENTER_PROFILE_INIT(sname)

#define TRACE_SYS_EXIT_PROFILE(sname)

#define TRACE_SYS_EXIT_PROFILE_INIT(sname)

#endif

#endif /* CONFIG_PERF_EVENTS */



#ifdef CONFIG_FTRACE_SYSCALLS

#define __SC_STR_ADECL1(t, a)		#a

include/trace/ftrace.h

+6 −6
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static inline int ftrace_get_offsets_##call( \ 


#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)



#ifdef CONFIG_EVENT_PROFILE

#ifdef CONFIG_PERF_EVENTS



/*

 * Generate the functions needed for tracepoint perf_event support.
@@ -541,7 +541,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\ 


#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)



#endif

#endif /* CONFIG_PERF_EVENTS */



/*

 * Stage 4 of the trace events.
@@ -626,7 +626,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\ 
 *

 */



#ifdef CONFIG_EVENT_PROFILE

#ifdef CONFIG_PERF_EVENTS



#define _TRACE_PROFILE_INIT(call)					\

	.profile_enable = ftrace_profile_enable_##call,			\
@@ -634,7 +634,7 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\ 


#else

#define _TRACE_PROFILE_INIT(call)

#endif

#endif /* CONFIG_PERF_EVENTS */



#undef __entry

#define __entry entry
@@ -834,7 +834,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
 * }

 */



#ifdef CONFIG_EVENT_PROFILE

#ifdef CONFIG_PERF_EVENTS



#undef __perf_addr

#define __perf_addr(a) __addr = (a)
@@ -926,7 +926,7 @@ static void ftrace_profile_##call(proto) \ 
	DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))



#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)

#endif /* CONFIG_EVENT_PROFILE */

#endif /* CONFIG_PERF_EVENTS */



#undef _TRACE_PROFILE_INIT

include/trace/syscall.h

+2 −2
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s); 
enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags);

enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags);

#endif

#ifdef CONFIG_EVENT_PROFILE



#ifdef CONFIG_PERF_EVENTS

int prof_sysenter_enable(struct ftrace_event_call *call);

void prof_sysenter_disable(struct ftrace_event_call *call);

int prof_sysexit_enable(struct ftrace_event_call *call);

void prof_sysexit_disable(struct ftrace_event_call *call);



#endif



#endif /* _TRACE_SYSCALL_H */