From: Adrian Bunk Date: Tue, 29 Apr 2008 07:49:05 +0000 (+0200) Subject: block/elevator.c:elv_rq_merge_ok() mustn't be inline X-Git-Tag: v2.6.26-rc1~372^2~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=72ed0bf60ade8d2cc1f58276cb16add0af2c3e25;p=linux-2.6-omap-h63xx.git block/elevator.c:elv_rq_merge_ok() mustn't be inline This patch fixes the following build error with UML and gcc 4.3: <-- snip --> ... CC block/elevator.o /home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c: In function ‘elv_merge’: /home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:73: sorry, unimplemented: inlining failed in call to ‘elv_rq_merge_ok’: function body not available /home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:103: sorry, unimplemented: called from here /home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:73: sorry, unimplemented: inlining failed in call to ‘elv_rq_merge_ok’: function body not available /home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:495: sorry, unimplemented: called from here make[2]: *** [block/elevator.o] Error 1 make[1]: *** [block] Error 2 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe --- diff --git a/block/elevator.c b/block/elevator.c index e8a90fe2342..7253fa05db0 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -69,7 +69,7 @@ static int elv_iosched_allow_merge(struct request *rq, struct bio *bio) /* * can we safely merge with this request? */ -inline int elv_rq_merge_ok(struct request *rq, struct bio *bio) +int elv_rq_merge_ok(struct request *rq, struct bio *bio) { if (!rq_mergeable(rq)) return 0;