aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-04-29 03:49:06 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-04-29 08:48:54 -0400
commit6f6a036e6e061563efecb61505fc4cc3ca415f80 (patch)
tree6bbb13cb230ef0a5fd465f47970641febb7125ea /block
parent72ed0bf60ade8d2cc1f58276cb16add0af2c3e25 (diff)
block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline
This patch fixes the following build error with UML and gcc 4.3: <-- snip --> ... CC block/blk-barrier.o /home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c: In function ‘blk_do_ordered’: /home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:57: sorry, unimplemented: inlining failed in call to ‘blk_ordered_cur_seq’: function body not available /home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:252: sorry, unimplemented: called from here /home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:57: sorry, unimplemented: inlining failed in call to ‘blk_ordered_cur_seq’: function body not available /home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:253: sorry, unimplemented: called from here make[2]: *** [block/blk-barrier.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-barrier.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index 722140ac175a..47127ba09e45 100644
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
@@ -53,7 +53,7 @@ EXPORT_SYMBOL(blk_queue_ordered);
53/* 53/*
54 * Cache flushing for ordered writes handling 54 * Cache flushing for ordered writes handling
55 */ 55 */
56inline unsigned blk_ordered_cur_seq(struct request_queue *q) 56unsigned blk_ordered_cur_seq(struct request_queue *q)
57{ 57{
58 if (!q->ordseq) 58 if (!q->ordseq)
59 return 0; 59 return 0;