---

yaml --- r: 42781 b: refs/heads/master c: 49033c8 h: refs/heads/master i: 42779: 8320ef6 v: v3
git-mirror · Dec 7, 2006 · 15913f8 · 15913f8
1 parent 28bebd2
commit 15913f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 593be07ae8f6f4a1b1b98813fabb155328f8bc0c
+refs/heads/master: 49033c81845f1bd2a69e53485f20d55a0e7bace5
diff --git a/trunk/Documentation/block/as-iosched.txt b/trunk/Documentation/block/as-iosched.txt
@@ -24,8 +24,10 @@ very similar behavior to the deadline IO scheduler.
 Selecting IO schedulers
 -----------------------
 To choose IO schedulers at boot time, use the argument 'elevator=deadline'.
-'noop' and 'as' (the default) are also available. IO schedulers are assigned
-globally at boot time only presently.
+'noop', 'as' and 'cfq' (the default) are also available. IO schedulers are
+assigned globally at boot time only presently. It's also possible to change
+the IO scheduler for a determined device on the fly, as described in
+Documentation/block/switching-sched.txt.
 
 
 Anticipatory IO scheduler Policies