diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2012-09-02 22:45:14 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-09-13 22:52:08 -0400 |
| commit | ea632e9f12033346cc68247faa3b924d54936b8b (patch) | |
| tree | b87fe48b7127a8d890ba7073fd460a1c99b0c831 /kernel/trace | |
| parent | 76bab1b78ab6f25d5f74165f94526c25fc93d984 (diff) | |
trace: Stop compiling in trace_clock unconditionally
Commit 56449f437 "tracing: make the trace clocks available generally",
in April 2009, made trace_clock available unconditionally, since
CONFIG_X86_DS used it too.
Commit faa4602e47 "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: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/Kconfig | 5 | ||||
| -rw-r--r-- | kernel/trace/Makefile | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 9301a0e35e0c..4cea4f41c1d9 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
| @@ -62,8 +62,12 @@ config HAVE_C_RECORDMCOUNT | |||
| 62 | config TRACER_MAX_TRACE | 62 | config TRACER_MAX_TRACE |
| 63 | bool | 63 | bool |
| 64 | 64 | ||
| 65 | config TRACE_CLOCK | ||
| 66 | bool | ||
| 67 | |||
| 65 | config RING_BUFFER | 68 | config RING_BUFFER |
| 66 | bool | 69 | bool |
| 70 | select TRACE_CLOCK | ||
| 67 | 71 | ||
| 68 | config FTRACE_NMI_ENTER | 72 | config FTRACE_NMI_ENTER |
| 69 | bool | 73 | bool |
| @@ -114,6 +118,7 @@ config TRACING | |||
| 114 | select NOP_TRACER | 118 | select NOP_TRACER |
| 115 | select BINARY_PRINTF | 119 | select BINARY_PRINTF |
| 116 | select EVENT_TRACING | 120 | select EVENT_TRACING |
| 121 | select TRACE_CLOCK | ||
| 117 | 122 | ||
| 118 | config GENERIC_TRACER | 123 | config GENERIC_TRACER |
| 119 | bool | 124 | bool |
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 837090808aac..d7e2068e4b71 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile | |||
| @@ -19,11 +19,7 @@ endif | |||
| 19 | 19 | ||
| 20 | CFLAGS_trace_events_filter.o := -I$(src) | 20 | CFLAGS_trace_events_filter.o := -I$(src) |
| 21 | 21 | ||
| 22 | # | 22 | obj-$(CONFIG_TRACE_CLOCK) += trace_clock.o |
| 23 | # Make the trace clocks available generally: it's infrastructure | ||
| 24 | # relied on by ptrace for example: | ||
| 25 | # | ||
| 26 | obj-y += trace_clock.o | ||
| 27 | 23 | ||
| 28 | obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o | 24 | obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o |
| 29 | obj-$(CONFIG_RING_BUFFER) += ring_buffer.o | 25 | obj-$(CONFIG_RING_BUFFER) += ring_buffer.o |