tracing/events: convert block trace points to TRACE_EVENT(), fix !CONFIG_BLOCK
authorLi Zefan <lizf@cn.fujitsu.com>
Wed, 10 Jun 2009 02:06:24 +0000 (10:06 +0800)
committerIngo Molnar <mingo@elte.hu>
Wed, 10 Jun 2009 09:55:06 +0000 (11:55 +0200)
Fix building failures when CONFIG_BLOCK == n.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4A2F1520.8020003@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/blktrace_api.h

index c7ec31dd04c9ced9f74744c831139458d91b92ea..7e4350ece0f8dd495398ca4cbf41c95e995b6525 100644 (file)
@@ -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