lkml.org 
[lkml]   [2012]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/7] 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 | 2 +-
    kernel/trace/Kconfig | 5 +++++
    kernel/trace/Makefile | 6 +-----
    3 files changed, 7 insertions(+), 6 deletions(-)

    diff --git a/kernel/Makefile b/kernel/Makefile
    index c0cc67a..29d993b 100644
    --- a/kernel/Makefile
    +++ b/kernel/Makefile
    @@ -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
    diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
    index 9301a0e..4cea4f4 100644
    --- a/kernel/trace/Kconfig
    +++ b/kernel/trace/Kconfig
    @@ -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
    diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
    index 8370908..d7e2068 100644
    --- a/kernel/trace/Makefile
    +++ b/kernel/trace/Makefile
    @@ -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
    --
    1.7.10.4

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-09-08 14:41    [W:3.729 / U:1.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site