From 15913f86710051eda1eed3ef6536694799f0d3f6 Mon Sep 17 00:00:00 2001 From: Filipe Date: Wed, 6 Dec 2006 20:36:04 -0800 Subject: [PATCH] --- yaml --- r: 42781 b: refs/heads/master c: 49033c81845f1bd2a69e53485f20d55a0e7bace5 h: refs/heads/master i: 42779: 8320ef68934848e7f95acb4ff28f40ce3bb9c2da v: v3 --- [refs] | 2 +- trunk/Documentation/block/as-iosched.txt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fbd44d83543b..96c1225b2076 100644 --- 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 index e2a66f8143c5..a598fe10a297 100644 --- 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