Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Adrian Bunk and committed by
Jens Axboe
6f6a036e 72ed0bf6

+1 -1
+1 -1
block/blk-barrier.c
··· 53 53 /* 54 54 * Cache flushing for ordered writes handling 55 55 */ 56 - inline unsigned blk_ordered_cur_seq(struct request_queue *q) 56 + unsigned blk_ordered_cur_seq(struct request_queue *q) 57 57 { 58 58 if (!q->ordseq) 59 59 return 0;