diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:13:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:13:46 -0800 |
| commit | 468e6d17ff42e6f291a88c87681b2b5e34e9ab33 (patch) | |
| tree | 2877d59eef8cc3a59cc647c4daf50dabea3f065a /include/linux/blk.h | |
| parent | d694597ed5e1f6613d0933ee692333ab2542b603 (diff) | |
v2.5.2.1 -> v2.5.2.1.1
- David Howells: abtract out "current->need_resched" as "need_resched()"
- Frank Davis: ide-tape update for bio
- various: header file fixups
- Jens Axboe: fix up bio/ide/highmem issues
- Kai Germaschewski: ISDN update
- Tim Waugh: parport update
- Patrik Mochel: initcall update
- Greg KH: USB and Compaq PCI hotplug updates
Diffstat (limited to 'include/linux/blk.h')
| -rw-r--r-- | include/linux/blk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blk.h b/include/linux/blk.h index efede40e2408..b6507e62eb4b 100644 --- a/include/linux/blk.h +++ b/include/linux/blk.h @@ -90,9 +90,9 @@ extern inline struct request *elv_next_request(request_queue_t *q) #define _elv_add_request(q, rq, back, p) do { \ if ((back)) \ - _elv_add_request_core((q), (rq), (q)->queue_head.prev, (p)); \ + _elv_add_request_core((q), (rq), (q)->queue_head.prev, (p)); \ else \ - _elv_add_request_core((q), (rq), &(q)->queue_head, 0); \ + _elv_add_request_core((q), (rq), &(q)->queue_head, (p)); \ } while (0) #define elv_add_request(q, rq, back) _elv_add_request((q), (rq), (back), 1) |