Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 870915e0 authored Oct 28, 2010 by Mathieu Desnoyers Committed by Steven Rostedt Jan 07, 2011

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 <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>

parent 1dbd1951

kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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