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

Manual fixup for trivial "gfp_t" changes.

diff --cc drivers/block/elevator.c
Simple merge

diff --cc drivers/block/ll_rw_blk.c
index c4f1862,fc12d01..0af7351
--- 1/drivers/block/ll_rw_blk.c
--- 2/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@@ -1790,7 -1790,8 +1790,8 @@@ static inline void blk_free_request(req
  }
  
  static inline struct request *
- blk_alloc_request(request_queue_t *q, int rw, struct bio *bio, gfp_t gfp_mask)
+ blk_alloc_request(request_queue_t *q, int rw, struct bio *bio,
 -                int priv, int gfp_mask)
++                int priv, gfp_t gfp_mask)
  {
        struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask);
  

diff --cc include/linux/blkdev.h
index fffe163,7d9d14d..025a7f0
--- 1/include/linux/blkdev.h
--- 2/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -668,12 -668,10 +668,10 @@@ extern void blk_dump_rq_flags(struct re
  extern void generic_unplug_device(request_queue_t *);
  extern void __generic_unplug_device(request_queue_t *);
  extern long nr_blockdev_pages(void);
- extern void blk_wait_queue_drained(request_queue_t *, int);
- extern void blk_finish_queue_drain(request_queue_t *);
  
  int blk_get_queue(request_queue_t *);
 -request_queue_t *blk_alloc_queue(int gfp_mask);
 -request_queue_t *blk_alloc_queue_node(int,int);
 +request_queue_t *blk_alloc_queue(gfp_t);
 +request_queue_t *blk_alloc_queue_node(gfp_t, int);
  #define blk_put_queue(q) blk_cleanup_queue((q))
  
  /*