Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=43d28d98bed372649060ef783719b426a91972ed Commit: 43d28d98bed372649060ef783719b426a91972ed Parent: 2da96acde0318f121ed3f5993ae9324c856ecfd4 Author: Jens Axboe <[EMAIL PROTECTED]> AuthorDate: Fri Oct 12 12:50:07 2007 +0200 Committer: Jens Axboe <[EMAIL PROTECTED]> CommitDate: Fri Oct 12 12:50:07 2007 +0200
[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 <[EMAIL PROTECTED]> --- include/linux/blktrace_api.h | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 2e105a1..7e11d23 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 - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html