aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/block/as-iosched.txt
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-07 16:35:17 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-07 16:35:17 -0500
commit21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch)
treee1be8645297f8ebe87445251743ebcc52081a20d /Documentation/block/as-iosched.txt
parent34161db6b14d984fb9b06c735b7b42f8803f6851 (diff)
parent68380b581383c028830f79ec2670f4a193854aa6 (diff)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'Documentation/block/as-iosched.txt')
-rw-r--r--Documentation/block/as-iosched.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/block/as-iosched.txt b/Documentation/block/as-iosched.txt
index e2a66f8143c5..a598fe10a297 100644
--- a/Documentation/block/as-iosched.txt
+++ b/Documentation/block/as-iosched.txt
@@ -24,8 +24,10 @@ very similar behavior to the deadline IO scheduler.
24Selecting IO schedulers 24Selecting IO schedulers
25----------------------- 25-----------------------
26To choose IO schedulers at boot time, use the argument 'elevator=deadline'. 26To choose IO schedulers at boot time, use the argument 'elevator=deadline'.
27'noop' and 'as' (the default) are also available. IO schedulers are assigned 27'noop', 'as' and 'cfq' (the default) are also available. IO schedulers are
28globally at boot time only presently. 28assigned globally at boot time only presently. It's also possible to change
29the IO scheduler for a determined device on the fly, as described in
30Documentation/block/switching-sched.txt.
29 31
30 32
31Anticipatory IO scheduler Policies 33Anticipatory IO scheduler Policies