Skip to contentSkip to conversation

tracing: fix TRACE_EVENT power tracepoint creation (v2)

PATCH In review Mathieu Desnoyers 2 participants 3 messages Oct 28, 2010 – Jan 9, 2011 Tracing

lore
Share & tools
lore

Mathieu Desnoyers

author reviewer
#0 lore raw

PATCH 1/1 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 <[email protected]>
CC Arjan van de Ven <[email protected]>
CC Steven Rostedt <[email protected]>
---
 kernel/Makefile       |    1 +
 kernel/trace/Makefile |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
kernel/Makefile +1 -0
Index: 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
kernel/trace/Makefile +1 -1
Index: 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
Signature · 4 lines
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
author reviewer
#2 lore raw

[tip:perf/urgent] tracing: Fix TRACE_EVENT power tracepoint creation

In reply to Mathieu Desnoyers
Commit-ID:  870915e047a2da695be118d32dd5a900f0c3e933
Gitweb:     http://git.kernel.org/tip/870915e047a2da695be118d32dd5a900f0c3e933
Author:     Mathieu Desnoyers <[email protected]>
AuthorDate: Thu, 28 Oct 2010 11:31:17 -0400
Committer:  Steven Rostedt <[email protected]>
CommitDate: Fri, 7 Jan 2011 23:26:29 -0500

tracing: Fix TRACE_EVENT power tracepoint creation

DEFINE_TRACE should also exist when CONFIG_EVENT_TRACING=n. Otherwise, setting only TRACEPOINTS=y is broken.

Acked-by Arjan van de Ven <[email protected]>
Signed-off-by Mathieu Desnoyers <[email protected]>

LKML-Reference: <20101028153117.GA4051@Krystal>

Signed-off-by Steven Rostedt <[email protected]>
---
 kernel/Makefile       |    1 +
 kernel/trace/Makefile |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
kernel/Makefile +1 -0
index 0b5ff08..e0f2831 100644
@@ -100,6 +100,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_IRQ_WORK) += irq_work.o
 obj-$(CONFIG_PERF_EVENTS) += perf_event.o
kernel/trace/Makefile +1 -1
index 53f3381..761c510 100644
@@ -52,7 +52,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_event_perf.o
 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