From 9554c8afd2c5c85c7f88a56567834242ba3a2fc5 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 28 Oct 2010 11:31:17 -0400 Subject: [PATCH] --- yaml --- r: 228948 b: refs/heads/master c: 870915e047a2da695be118d32dd5a900f0c3e933 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/Makefile | 1 + trunk/kernel/trace/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4a224389e98c..7f6ece9511b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dbd1951f39e13da579ffe879cce19586d0462de +refs/heads/master: 870915e047a2da695be118d32dd5a900f0c3e933 diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile index 0b5ff083fa22..e0f2831634b4 100644 --- a/trunk/kernel/Makefile +++ b/trunk/kernel/Makefile @@ -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 diff --git a/trunk/kernel/trace/Makefile b/trunk/kernel/trace/Makefile index 53f338190b26..761c510a06c5 100644 --- a/trunk/kernel/trace/Makefile +++ b/trunk/kernel/trace/Makefile @@ -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