From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Arjan van de Ven <arjan@linux.intel.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: [PATCH 6/7] tracing: Fix TRACE_EVENT power tracepoint creation
Date: Sat, 08 Jan 2011 15:16:05 -0500 [thread overview]
Message-ID: <20110108201646.033913374@goodmis.org> (raw)
In-Reply-To: 20110108201559.130182944@goodmis.org
[-- Attachment #1: 0006-tracing-Fix-TRACE_EVENT-power-tracepoint-creation.patch --]
[-- Type: text/plain, Size: 1443 bytes --]
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
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 | 1 +
kernel/trace/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/Makefile b/kernel/Makefile
index 0b5ff08..e0f2831 100644
--- a/kernel/Makefile
+++ b/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/kernel/trace/Makefile b/kernel/trace/Makefile
index 53f3381..761c510 100644
--- a/kernel/trace/Makefile
+++ b/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
--
1.7.2.3
next prev parent reply other threads:[~2011-01-08 20:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-08 20:15 [PATCH 0/7] [GIT PULL][2.6.38] tracing: updates and fixes Steven Rostedt
2011-01-08 20:16 ` [PATCH 1/7] tracing: Include module.h in define_trace.h Steven Rostedt
2011-01-08 20:16 ` [PATCH 2/7] tracing/trivial: Add missing comma in TRACE_EVENT comment Steven Rostedt
2011-01-08 20:16 ` [PATCH 3/7] tracing: remove duplicate null-pointer check in skb tracepoint Steven Rostedt
2011-01-08 20:16 ` [PATCH 4/7] tracepoint: Add __rcu annotation Steven Rostedt
2011-01-08 20:16 ` [PATCH 5/7] tracing: Fix preempt count leak Steven Rostedt
2011-01-08 20:16 ` Steven Rostedt [this message]
2011-01-08 20:16 ` [PATCH 7/7] dynamic debug: Fix build issue with older gcc Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110108201646.033913374@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=arjan@linux.intel.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.