Merge branch 'urgent' of git://amd64.org/linux/rric into perf/urgent

[mv-sheeva.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index ea85e20d5e9462be965f3f117bd7c3efcf51aa57..cfcc37cb222b63722bc048814c0f392205d1a898 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -465,3 +465,9 @@ int attempt_front_merge(struct request_queue *q, struct request *rq)
 
        return 0;
 }
+
+int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
+                         struct request *next)
+{
+       return attempt_merge(q, rq, next);
+}