GIT 829b20f492e67d249f4048b0a3a46b1081bcd40f git+ssh://master.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git#for-linus commit 829b20f492e67d249f4048b0a3a46b1081bcd40f Author: Coywolf Qi Hunt Date: Wed Dec 28 10:55:49 2005 +0100 make elv_try_merge() static, kill the dead declaration of elv_try_last_merge(). Signed-off-by: Coywolf Qi Hunt Signed-off-by: Jens Axboe commit 6fc2946f19dbaf8edaf7d6d8ef5965271c1a09aa Author: Nicolas Kaiser Date: Mon Nov 28 09:40:20 2005 +0100 [BLOCK][TRIVIAL] ll_rw_blk: header included twice linux/blkdev.h included twice Signed-off-by: Nicolas Kaiser Signed-off-by: Jens Axboe --- Signed-off-by: Andrew Morton --- block/elevator.c | 3 +-- block/ll_rw_blk.c | 1 - include/linux/elevator.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff -puN block/elevator.c~git-block block/elevator.c --- devel/block/elevator.c~git-block 2006-01-04 19:35:52.000000000 -0800 +++ devel-akpm/block/elevator.c 2006-01-04 19:35:52.000000000 -0800 @@ -65,7 +65,7 @@ inline int elv_rq_merge_ok(struct reques } EXPORT_SYMBOL(elv_rq_merge_ok); -inline int elv_try_merge(struct request *__rq, struct bio *bio) +static inline int elv_try_merge(struct request *__rq, struct bio *bio) { int ret = ELEVATOR_NO_MERGE; @@ -81,7 +81,6 @@ inline int elv_try_merge(struct request return ret; } -EXPORT_SYMBOL(elv_try_merge); static struct elevator_type *elevator_find(const char *name) { diff -puN block/ll_rw_blk.c~git-block block/ll_rw_blk.c --- devel/block/ll_rw_blk.c~git-block 2006-01-04 19:35:52.000000000 -0800 +++ devel-akpm/block/ll_rw_blk.c 2006-01-04 19:35:58.000000000 -0800 @@ -26,7 +26,6 @@ #include #include #include -#include #include /* diff -puN include/linux/elevator.h~git-block include/linux/elevator.h --- devel/include/linux/elevator.h~git-block 2006-01-04 19:35:52.000000000 -0800 +++ devel-akpm/include/linux/elevator.h 2006-01-04 19:35:52.000000000 -0800 @@ -114,8 +114,6 @@ extern ssize_t elv_iosched_store(request extern int elevator_init(request_queue_t *, char *); extern void elevator_exit(elevator_t *); extern int elv_rq_merge_ok(struct request *, struct bio *); -extern int elv_try_merge(struct request *, struct bio *); -extern int elv_try_last_merge(request_queue_t *, struct bio *); /* * Return values from elevator merger _