From: tip-bot for Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
mathieu.desnoyers@efficios.com, rostedt@goodmis.org,
arjan@linux.intel.com, tglx@linutronix.de
Subject: [tip:perf/urgent] tracing: Fix TRACE_EVENT power tracepoint creation
Date: Sun, 9 Jan 2011 21:12:04 GMT [thread overview]
Message-ID: <tip-870915e047a2da695be118d32dd5a900f0c3e933@git.kernel.org> (raw)
In-Reply-To: <20101028153117.GA4051@Krystal>
Commit-ID: 870915e047a2da695be118d32dd5a900f0c3e933
Gitweb: http://git.kernel.org/tip/870915e047a2da695be118d32dd5a900f0c3e933
Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
AuthorDate: Thu, 28 Oct 2010 11:31:17 -0400
Committer: Steven Rostedt <rostedt@goodmis.org>
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 <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
prev parent reply other threads:[~2011-01-09 21:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 15:31 [PATCH] tracing: fix TRACE_EVENT power tracepoint creation (v2) Mathieu Desnoyers
2010-10-28 15:33 ` Arjan van de Ven
2011-01-09 21:12 ` tip-bot for Mathieu Desnoyers [this message]
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=tip-870915e047a2da695be118d32dd5a900f0c3e933@git.kernel.org \
--to=mathieu.desnoyers@efficios.com \
--cc=arjan@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome