From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 28 Oct 2005 15:56:34 +0000 (-0700)
Subject: Merge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.15-rc1~733^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd962494f76fb3ef1196cd420b5d6260d7a3766;p=linux-2.6

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

Manual fixup for trivial "gfp_t" changes.
---

5dd962494f76fb3ef1196cd420b5d6260d7a3766
diff --cc drivers/block/ll_rw_blk.c
index c4f186223b,fc12d019b1..0af73512b9
--- a/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 fffe163316,7d9d14d6d8..025a7f084d
--- a/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))
  
  /*