---

yaml --- r: 18664 b: refs/heads/master c: 4c26458 h: refs/heads/master v: v3
git-mirror · Jan 17, 2006 · 8640b52 · 8640b52
1 parent 663e2b3
commit 8640b52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aeebe01cb2ba1bca4cd9b8a6e77386bd7499dc2
+refs/heads/master: 4c2645830e29c082217662e7486572e9637e9f1d
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
@@ -149,6 +149,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.
  	 */