Commit 72ed0bf6 authored Apr 29, 2008 by Adrian Bunk Committed by Jens Axboe Apr 29, 2008

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>

parent 75ad23bc

block/elevator.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message