aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-10-12 12:50:07 +0200
committerJens Axboe <jens.axboe@oracle.com>2007-10-12 12:50:07 +0200
commit43d28d98bed372649060ef783719b426a91972ed (patch)
treeddc57daf6fa4a7898936904cc0ab52ecdec3ce4e
parent2da96acde0318f121ed3f5993ae9324c856ecfd4 (diff)
downloadmrst-s0i3-test-43d28d98bed372649060ef783719b426a91972ed.tar.gz
mrst-s0i3-test-43d28d98bed372649060ef783719b426a91972ed.tar.xz
mrst-s0i3-test-43d28d98bed372649060ef783719b426a91972ed.zip
[BLOCK] Better fix for do_blk_trace_setup() for !CONFIG_BLOCK
We don't have the request queue definition, so just make it a macro instead. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--include/linux/blktrace_api.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 2e105a12fe2..7e11d23ac36 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -290,12 +290,7 @@ static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio,
#define blk_add_trace_generic(q, rq, rw, what) do { } while (0)
#define blk_add_trace_pdu_int(q, what, bio, pdu) do { } while (0)
#define blk_add_trace_remap(q, bio, dev, f, t) do {} while (0)
-static inline int do_blk_trace_setup(struct request_queue *q,
- struct block_device *bdev,
- struct blk_user_trace_setup *buts)
-{
- return 0;
-}
+#define do_blk_trace_setup(q, bdev, buts) (-ENOTTY)
#endif /* CONFIG_BLK_DEV_IO_TRACE */
#endif /* __KERNEL__ */
#endif