rpms/kernel/devel linux-2.6-default-elevator.patch, NONE, 1.1 kernel-2.6.spec, 1.1605, 1.1606 linux-2.6.11-default-elevator.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1235

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-default-elevator.patch 
Removed Files:
	linux-2.6.11-default-elevator.patch 
Log Message:
comment & rename.


linux-2.6-default-elevator.patch:
 elevator.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-default-elevator.patch ---

Use the CFQ elevator by default, as it's the best 'all rounder'.

--- linux-2.6.11/drivers/block/elevator.c~	2005-04-01 19:58:18.000000000 -0500
+++ linux-2.6.11/drivers/block/elevator.c	2005-04-01 19:58:53.000000000 -0500
@@ -159,12 +159,12 @@ static void elevator_setup_default(void)
 	if (chosen_elevator[0] && elevator_find(chosen_elevator))
 		return;
 
-#if defined(CONFIG_IOSCHED_AS)
+#if defined(CONFIG_IOSCHED_CFQ)
+	strcpy(chosen_elevator, "cfq");
+#elif defined(CONFIG_IOSCHED_AS)
 	strcpy(chosen_elevator, "anticipatory");
 #elif defined(CONFIG_IOSCHED_DEADLINE)
 	strcpy(chosen_elevator, "deadline");
-#elif defined(CONFIG_IOSCHED_CFQ)
-	strcpy(chosen_elevator, "cfq");
 #elif defined(CONFIG_IOSCHED_NOOP)
 	strcpy(chosen_elevator, "noop");
 #else


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1605
retrieving revision 1.1606
diff -u -r1.1605 -r1.1606
--- kernel-2.6.spec	14 Oct 2005 20:38:23 -0000	1.1605
+++ kernel-2.6.spec	15 Oct 2005 00:49:29 -0000	1.1606
@@ -274,7 +274,7 @@
 Patch1070: linux-2.6.0-sleepon.patch
 
 # Tweak some defaults.
-Patch1080: linux-2.6.11-default-elevator.patch
+Patch1080: linux-2.6-default-elevator.patch
 Patch1081: linux-2.6-max-symlinks.patch
 Patch1082: linux-2.6-optimise-for-size.patch
 


--- linux-2.6.11-default-elevator.patch DELETED ---