lkml.org 
[lkml]   [2010]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] tracing: fix TRACE_EVENT power tracepoint creation (v2)
    DEFINE_TRACE should also exist when CONFIG_EVENT_TRACING=n. Otherwise, setting
    only TRACEPOINTS=y is broken.

    Changelog since v1:
    - Only change the makefiles, as required.
    - Patch based on 2.6.36 mainline kernel.

    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    CC: Arjan van de Ven <arjan@linux.intel.com>
    CC: Steven Rostedt <rostedt@goodmis.org>
    ---
    kernel/Makefile | 1 +
    kernel/trace/Makefile | 2 +-
    2 files changed, 2 insertions(+), 1 deletion(-)

    Index: linux-2.6-lttng/kernel/Makefile
    ===================================================================
    --- linux-2.6-lttng.orig/kernel/Makefile
    +++ linux-2.6-lttng/kernel/Makefile
    @@ -99,6 +99,7 @@ obj-$(CONFIG_FUNCTION_TRACER) += trace/
    obj-$(CONFIG_TRACING) += trace/
    obj-$(CONFIG_X86_DS) += trace/
    obj-$(CONFIG_RING_BUFFER) += trace/
    +obj-$(CONFIG_TRACEPOINTS) += trace/
    obj-$(CONFIG_SMP) += sched_cpupri.o
    obj-$(CONFIG_PERF_EVENTS) += perf_event.o
    obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
    Index: linux-2.6-lttng/kernel/trace/Makefile
    ===================================================================
    --- linux-2.6-lttng.orig/kernel/trace/Makefile
    +++ linux-2.6-lttng/kernel/trace/Makefile
    @@ -52,7 +52,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_eve
    endif
    obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
    obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
    -obj-$(CONFIG_EVENT_TRACING) += power-traces.o
    +obj-$(CONFIG_TRACEPOINTS) += power-traces.o
    ifeq ($(CONFIG_TRACING),y)
    obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
    endif
    --
    Mathieu Desnoyers
    Operating System Efficiency R&D Consultant
    EfficiOS Inc.
    http://www.efficios.com

    \
     
     \ /
      Last update: 2010-10-28 17:33    [W:0.023 / U:29.504 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site