diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-11-11 06:09:59 -0500 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-11 06:09:59 -0500 |
commit | 17a9e7bbae178d1326e4631ab6350a272349c99d (patch) | |
tree | eaa63823d47367e5d6dea9f12b5a531237152e1f | |
parent | 02e031cbc843b010e72fcc05c76113c688b2860f (diff) |
Documentation: remove anticipatory scheduler info
Remove anticipatory block I/O scheduler info from Documentation/
since the code has been deleted.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Reported-by: "Robert P. J. Day" <rpjday@crashcourse.ca>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r-- | Documentation/block/switching-sched.txt | 8 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | Documentation/rbtree.txt | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/block/switching-sched.txt b/Documentation/block/switching-sched.txt index d5af3f630814..71cfbdc0f74d 100644 --- a/Documentation/block/switching-sched.txt +++ b/Documentation/block/switching-sched.txt | |||
@@ -16,7 +16,7 @@ you can do so by typing: | |||
16 | As of the Linux 2.6.10 kernel, it is now possible to change the | 16 | As of the Linux 2.6.10 kernel, it is now possible to change the |
17 | IO scheduler for a given block device on the fly (thus making it possible, | 17 | IO scheduler for a given block device on the fly (thus making it possible, |
18 | for instance, to set the CFQ scheduler for the system default, but | 18 | for instance, to set the CFQ scheduler for the system default, but |
19 | set a specific device to use the anticipatory or noop schedulers - which | 19 | set a specific device to use the deadline or noop schedulers - which |
20 | can improve that device's throughput). | 20 | can improve that device's throughput). |
21 | 21 | ||
22 | To set a specific scheduler, simply do this: | 22 | To set a specific scheduler, simply do this: |
@@ -31,7 +31,7 @@ a "cat /sys/block/DEV/queue/scheduler" - the list of valid names | |||
31 | will be displayed, with the currently selected scheduler in brackets: | 31 | will be displayed, with the currently selected scheduler in brackets: |
32 | 32 | ||
33 | # cat /sys/block/hda/queue/scheduler | 33 | # cat /sys/block/hda/queue/scheduler |
34 | noop anticipatory deadline [cfq] | 34 | noop deadline [cfq] |
35 | # echo anticipatory > /sys/block/hda/queue/scheduler | 35 | # echo deadline > /sys/block/hda/queue/scheduler |
36 | # cat /sys/block/hda/queue/scheduler | 36 | # cat /sys/block/hda/queue/scheduler |
37 | noop [anticipatory] deadline cfq | 37 | noop [deadline] cfq |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index ed45e9802aa8..92e83e53148f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -706,7 +706,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
706 | arch/x86/kernel/cpu/cpufreq/elanfreq.c. | 706 | arch/x86/kernel/cpu/cpufreq/elanfreq.c. |
707 | 707 | ||
708 | elevator= [IOSCHED] | 708 | elevator= [IOSCHED] |
709 | Format: {"anticipatory" | "cfq" | "deadline" | "noop"} | 709 | Format: {"cfq" | "deadline" | "noop"} |
710 | See Documentation/block/as-iosched.txt and | 710 | See Documentation/block/as-iosched.txt and |
711 | Documentation/block/deadline-iosched.txt for details. | 711 | Documentation/block/deadline-iosched.txt for details. |
712 | 712 | ||
diff --git a/Documentation/rbtree.txt b/Documentation/rbtree.txt index 221f38be98f4..19f8278c3854 100644 --- a/Documentation/rbtree.txt +++ b/Documentation/rbtree.txt | |||
@@ -21,8 +21,8 @@ three rotations, respectively, to balance the tree), with slightly slower | |||
21 | To quote Linux Weekly News: | 21 | To quote Linux Weekly News: |
22 | 22 | ||
23 | There are a number of red-black trees in use in the kernel. | 23 | There are a number of red-black trees in use in the kernel. |
24 | The anticipatory, deadline, and CFQ I/O schedulers all employ | 24 | The deadline and CFQ I/O schedulers employ rbtrees to |
25 | rbtrees to track requests; the packet CD/DVD driver does the same. | 25 | track requests; the packet CD/DVD driver does the same. |
26 | The high-resolution timer code uses an rbtree to organize outstanding | 26 | The high-resolution timer code uses an rbtree to organize outstanding |
27 | timer requests. The ext3 filesystem tracks directory entries in a | 27 | timer requests. The ext3 filesystem tracks directory entries in a |
28 | red-black tree. Virtual memory areas (VMAs) are tracked with red-black | 28 | red-black tree. Virtual memory areas (VMAs) are tracked with red-black |