tracing: Fix TRACE_EVENT power tracepoint creation
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Thu, 28 Oct 2010 15:31:17 +0000 (11:31 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Sat, 8 Jan 2011 04:26:29 +0000 (23:26 -0500)
DEFINE_TRACE should also exist when CONFIG_EVENT_TRACING=n. Otherwise, setting
only TRACEPOINTS=y is broken.

Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
LKML-Reference: <20101028153117.GA4051@Krystal>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/Makefile
kernel/trace/Makefile

index 0b5ff083fa22fa381a6fc1f092a824f255bda01a..e0f2831634b4c9388e4a1d73d605951253902cb0 100644 (file)
@@ -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
index 53f338190b260df929d3ef6020d2bad817fcc73f..761c510a06c5989ac7e03be55991a1ac346b4db2 100644 (file)
@@ -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