Merge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block

[linux-3.10.git] / drivers / block / elevator.c

diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index 8de77416bd2f65fde129869f4827a50387742ab0..55621d5c577403e3024a6dac9b580185c6c6b9cf 100644 (file)
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -558,7 +558,7 @@ struct request *elv_former_request(request_queue_t *q, struct request *rq)
 }
 
 int elv_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
-                   int gfp_mask)
+                   gfp_t gfp_mask)
 {
        elevator_t *e = q->elevator;