From: Li Zefan <lizf@cn.fujitsu.com>
To: Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH] tracing/events: convert block trace points to TRACE_EVENT(), fix
Date: Wed, 10 Jun 2009 10:06:24 +0800 [thread overview]
Message-ID: <4A2F1520.8020003@cn.fujitsu.com> (raw)
In-Reply-To: <4A2F1126.5010306@cn.fujitsu.com>
Fix building failures when CONFIG_BLOCK == n.
[ Impact: build fix ]
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
include/linux/blktrace_api.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index c7ec31d..7e4350e 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -218,7 +218,7 @@ static inline int blk_trace_init_sysfs(struct device *dev)
#endif /* CONFIG_BLK_DEV_IO_TRACE */
-#ifdef CONFIG_EVENT_TRACING
+#if defined(CONFIG_EVENT_TRACING) && defined(CONFIG_BLOCK)
static inline int blk_cmd_buf_len(struct request *rq)
{
@@ -229,7 +229,7 @@ extern void blk_dump_cmd(char *buf, struct request *rq);
extern void blk_fill_rwbs(char *rwbs, u32 rw, int bytes);
extern void blk_fill_rwbs_rq(char *rwbs, struct request *rq);
-#endif /* CONFIG_EVENT_TRACING */
+#endif /* CONFIG_EVENT_TRACING && CONFIG_BLOCK */
#endif /* __KERNEL__ */
#endif
--
1.5.4.rc3
next prev parent reply other threads:[~2009-06-10 2:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 16:36 [PATCH 0/2] [GIT PULL] tracing/events/ring-buffer: block trace points and fix Steven Rostedt
2009-06-09 16:36 ` [PATCH 1/2] ring-buffer: fix ret in rb_add_time_stamp Steven Rostedt
2009-06-09 16:36 ` [PATCH 2/2] tracing/events: convert block trace points to TRACE_EVENT() Steven Rostedt
2009-06-09 18:24 ` Steven Rostedt
2009-06-09 17:34 ` [PATCH 0/2] [GIT PULL] tracing/events/ring-buffer: block trace points and fix Steven Rostedt
2009-06-09 23:46 ` Ingo Molnar
2009-06-10 1:28 ` Li Zefan
2009-06-10 1:30 ` Ingo Molnar
2009-06-10 1:31 ` Steven Rostedt
2009-06-10 1:36 ` Li Zefan
2009-06-10 1:41 ` Steven Rostedt
2009-06-10 1:49 ` Li Zefan
2009-06-10 2:06 ` Li Zefan [this message]
2009-06-10 2:50 ` [PATCH] tracing/events: convert block trace points to TRACE_EVENT(), fix Steven Rostedt
2009-06-10 2:56 ` Li Zefan
2009-06-10 9:57 ` [tip:tracing/core] tracing/events: convert block trace points to TRACE_EVENT(), fix !CONFIG_BLOCK tip-bot for Li Zefan
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=4A2F1520.8020003@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
/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