diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:43 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:08:47 -0400 |
| commit | aff364860aa105b2deacc6f21ec8ef524460e3fc (patch) | |
| tree | 18409ebe16b25b141598da9b6386d69416c06afa /include/linux/elevator.h | |
| parent | c7a7b814c9dca9ee01b38e63b4a46de87156d3b6 (diff) | |
| parent | 993ba1585cbb03fab012e41d1a5d24330a283b31 (diff) | |
Merge branch 'x86/numa' into x86-mm
Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab541^..993ba1585c.
3fe14ab541: x86-32, numa: Fix failure condition check in alloc_remap()
993ba1585c: x86-32, numa: Update remap allocator comments
Scheduled NUMA init 32/64bit unification changes depend on them.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/elevator.h')
| -rw-r--r-- | include/linux/elevator.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index d93efcc4457..21a8ebf2dc3 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
| @@ -101,7 +101,6 @@ extern void elv_dispatch_sort(struct request_queue *, struct request *); | |||
| 101 | extern void elv_dispatch_add_tail(struct request_queue *, struct request *); | 101 | extern void elv_dispatch_add_tail(struct request_queue *, struct request *); |
| 102 | extern void elv_add_request(struct request_queue *, struct request *, int); | 102 | extern void elv_add_request(struct request_queue *, struct request *, int); |
| 103 | extern void __elv_add_request(struct request_queue *, struct request *, int); | 103 | extern void __elv_add_request(struct request_queue *, struct request *, int); |
| 104 | extern void elv_insert(struct request_queue *, struct request *, int); | ||
| 105 | extern int elv_merge(struct request_queue *, struct request **, struct bio *); | 104 | extern int elv_merge(struct request_queue *, struct request **, struct bio *); |
| 106 | extern int elv_try_merge(struct request *, struct bio *); | 105 | extern int elv_try_merge(struct request *, struct bio *); |
| 107 | extern void elv_merge_requests(struct request_queue *, struct request *, | 106 | extern void elv_merge_requests(struct request_queue *, struct request *, |