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

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

28d721e24c88496ff8e9c4a0959bdc1415c0658e
diff --cc include/linux/elevator.h
index ed93125c1d,f9b5ec3812..a74c27e460
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@@ -18,8 -16,9 +16,9 @@@ typedef struct request *(elevator_reque
  typedef void (elevator_completed_req_fn) (request_queue_t *, struct request *);
  typedef int (elevator_may_queue_fn) (request_queue_t *, int, struct bio *);
  
 -typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, struct bio *, int);
 +typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, struct bio *, gfp_t);
  typedef void (elevator_put_req_fn) (request_queue_t *, struct request *);
+ typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);
  typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
  
  typedef int (elevator_init_fn) (request_queue_t *, elevator_t *);