From: Chris Wright Date: Tue, 24 Jan 2006 18:43:48 +0000 (-0800) Subject: Add AS elevator backwards compat patch X-Git-Tag: v2.6.14.7~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b5a40cc55d1fd9aa2dad43cf9dde4da9fbdb3f3;p=thirdparty%2Fkernel%2Fstable-queue.git Add AS elevator backwards compat patch --- diff --git a/queue/elevator-as-back-compatibility.patch b/queue/elevator-as-back-compatibility.patch new file mode 100644 index 00000000000..f6be01cb610 --- /dev/null +++ b/queue/elevator-as-back-compatibility.patch @@ -0,0 +1,39 @@ +From stable-bounces@linux.kernel.org Mon Jan 16 22:19:55 2006 +Message-Id: <200601170615.k0H6FDZ6028782@shell0.pdx.osdl.net> +To: torvalds@osdl.org +From: akpm@osdl.org +Date: Mon, 16 Jan 2006 22:14:55 -0800 +Cc: nickpiggin@yahoo.com.au, axboe@suse.de, 76306.1226@compuserve.com, stable@kernel.org +Subject: [PATCH] elevator=as back-compatibility + +From: Chuck Ebbert <76306.1226@compuserve.com> + +As of 2.6.15 you need to use "anticipatory" instead of "as". Fix that up +so that `elevator=as' still works. + +Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> +Cc: Nick Piggin +Cc: Jens Axboe +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Chris Wright +--- + block/elevator.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- linux-2.6.15.1.orig/block/elevator.c ++++ linux-2.6.15.1/block/elevator.c +@@ -150,6 +150,13 @@ static void elevator_setup_default(void) + if (!chosen_elevator[0]) + strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED); + ++ /* ++ * Be backwards-compatible with previous kernels, so users ++ * won't get the wrong elevator. ++ */ ++ if (!strcmp(chosen_elevator, "as")) ++ strcpy(chosen_elevator, "anticipatory"); ++ + /* + * If the given scheduler is not available, fall back to no-op. + */ diff --git a/queue/series b/queue/series index 0366f1c10fd..35c626b95fa 100644 --- a/queue/series +++ b/queue/series @@ -3,3 +3,4 @@ kill-blk_attempt_remerge.patch input-hid-fix-an-oops-in-pid-initialization-code.patch fix-double-decrement-of-mqueue_mnt-mnt_count-in-sys_mq_open.patch fix-oops-in-ufs_fill_super-at-mount-time.patch +elevator-as-back-compatibility.patch