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

Commit ea632e9f authored by Josh Triplett's avatar Josh Triplett Committed by Steven Rostedt
Browse files

trace: Stop compiling in trace_clock unconditionally 

Commit 56449f43 "tracing: make the trace clocks available generally",
in April 2009, made trace_clock available unconditionally, since
CONFIG_X86_DS used it too.

Commit faa4602e "x86, perf, bts, mm: Delete the never used BTS-ptrace code",
in March 2010, removed CONFIG_X86_DS, and now only CONFIG_RING_BUFFER (split
out from CONFIG_TRACING for general use) has a dependency on trace_clock. So,
only compile in trace_clock with CONFIG_RING_BUFFER or CONFIG_TRACING
enabled.

Link: http://lkml.kernel.org/r/20120903024513.GA19583@leaf



Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJosh Triplett <josh@joshtriplett.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 76bab1b7

kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ obj-$(CONFIG_COMPAT_BINFMT_ELF) += elfcore.o 
obj-$(CONFIG_BINFMT_ELF_FDPIC) += elfcore.o

obj-$(CONFIG_FUNCTION_TRACER) += trace/

obj-$(CONFIG_TRACING) += trace/

obj-$(CONFIG_X86_DS) += trace/

obj-$(CONFIG_TRACE_CLOCK) += trace/

obj-$(CONFIG_RING_BUFFER) += trace/

obj-$(CONFIG_TRACEPOINTS) += trace/

obj-$(CONFIG_IRQ_WORK) += irq_work.o

kernel/trace/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -62,8 +62,12 @@ config HAVE_C_RECORDMCOUNT 
config TRACER_MAX_TRACE

	bool



config TRACE_CLOCK

	bool



config RING_BUFFER

	bool

	select TRACE_CLOCK



config FTRACE_NMI_ENTER

       bool
@@ -114,6 +118,7 @@ config TRACING 
	select NOP_TRACER

	select BINARY_PRINTF

	select EVENT_TRACING

	select TRACE_CLOCK



config GENERIC_TRACER

	bool

kernel/trace/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -19,11 +19,7 @@ endif 


CFLAGS_trace_events_filter.o := -I$(src)



#

# Make the trace clocks available generally: it's infrastructure

# relied on by ptrace for example:

#

obj-y += trace_clock.o

obj-$(CONFIG_TRACE_CLOCK) += trace_clock.o



obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o

obj-$(CONFIG_RING_BUFFER) += ring_buffer.o