aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-04-29 09:49:05 +0200
committerJens Axboe <jens.axboe@oracle.com>2008-04-29 14:48:54 +0200
commit72ed0bf60ade8d2cc1f58276cb16add0af2c3e25 (patch)
tree749000baa1616394ec34678faf38cf6e1708d77f /block
parent75ad23bc0fcb4f992a5d06982bf0857ab1738e9e (diff)
downloadkernel_samsung_smdk4412-72ed0bf60ade8d2cc1f58276cb16add0af2c3e25.zip
kernel_samsung_smdk4412-72ed0bf60ade8d2cc1f58276cb16add0af2c3e25.tar.gz
kernel_samsung_smdk4412-72ed0bf60ade8d2cc1f58276cb16add0af2c3e25.tar.bz2
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 <bunk@kernel.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/elevator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c
index e8a90fe..7253fa0 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;