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

Commit 5f77a88b authored by Tom Zanussi's avatar Tom Zanussi Committed by Ingo Molnar
Browse files

tracing/infrastructure: separate event tracer from event support 



Add a new config option, CONFIG_EVENT_TRACING that gets selected
when CONFIG_TRACING is selected and adds everything needed by the stuff
in trace_export - basically all the event tracing support needed by e.g.
bprint, minus the actual events, which are only included if
CONFIG_EVENT_TRACER is selected.

So CONFIG_EVENT_TRACER can be used to turn on or off the generated events
(what I think of as the 'event tracer'), while CONFIG_EVENT_TRACING turns
on or off the base event tracing support used by both the event tracer and
the other things such as bprint that can't be configured out.

Signed-off-by: default avatarTom Zanussi <tzanussi@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: fweisbec@gmail.com
LKML-Reference: <1239178441.10295.34.camel@tropicana>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 77d9f465

include/asm-generic/vmlinux.lds.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#define BRANCH_PROFILE()

#endif



#ifdef CONFIG_EVENT_TRACER

#ifdef CONFIG_EVENT_TRACING

#define FTRACE_EVENTS()	VMLINUX_SYMBOL(__start_ftrace_events) = .;	\

			*(_ftrace_events)				\

			VMLINUX_SYMBOL(__stop_ftrace_events) = .;

kernel/trace/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ config FTRACE_NMI_ENTER 
       depends on HAVE_FTRACE_NMI_ENTER

       default y



config EVENT_TRACING

	bool



config TRACING

	bool

	select DEBUG_FS
@@ -56,6 +59,7 @@ config TRACING 
	select TRACEPOINTS

	select NOP_TRACER

	select BINARY_PRINTF

	select EVENT_TRACING



#

# Minimum requirements an architecture has to meet for us to

kernel/trace/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ obj-$(CONFIG_POWER_TRACER) += trace_power.o 
obj-$(CONFIG_KMEMTRACE) += kmemtrace.o

obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o

obj-$(CONFIG_BLK_DEV_IO_TRACE)	+= blktrace.o

obj-$(CONFIG_EVENT_TRACER) += trace_events.o

obj-$(CONFIG_EVENT_TRACING) += trace_events.o

obj-$(CONFIG_EVENT_TRACER) += events.o

obj-$(CONFIG_EVENT_TRACER) += trace_export.o

obj-$(CONFIG_EVENT_TRACING) += trace_export.o

obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o

obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o

obj-$(CONFIG_EVENT_TRACER) += trace_events_filter.o

obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o



libftrace-y := ftrace.o