]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
trace: Stop compiling in trace_clock unconditionally
authorJosh Triplett <josh@joshtriplett.org>
Mon, 3 Sep 2012 02:45:14 +0000 (19:45 -0700)
committerSteven Rostedt <rostedt@goodmis.org>
Fri, 14 Sep 2012 02:52:08 +0000 (22:52 -0400)
commitea632e9f12033346cc68247faa3b924d54936b8b
treeb87fe48b7127a8d890ba7073fd460a1c99b0c831
parent76bab1b78ab6f25d5f74165f94526c25fc93d984
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>
kernel/Makefile
kernel/trace/Kconfig
kernel/trace/Makefile