Author: waldi
Date: Tue Sep 26 19:53:04 2006
New Revision: 7534
Modified:
dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/changelog
Log:
* debian/arch/mips, debian/arch/mipsel: Unify io scheduler settings.
* debian/changelog: Update
Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22 (original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22 Tue Sep 26
19:53:04 2006
@@ -183,19 +183,6 @@
#
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_HW_HAS_EISA=y
Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32 (original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32 Tue Sep 26
19:53:04 2006
@@ -184,19 +184,6 @@
#
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_HW_HAS_PCI=y
Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a Tue Sep 26
19:53:04 2006
@@ -204,19 +204,6 @@
#
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_HW_HAS_PCI=y
Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b Tue Sep
26 19:53:04 2006
@@ -199,19 +199,6 @@
#
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_HW_HAS_PCI=y
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02 (original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02 Tue Sep 26
19:53:04 2006
@@ -185,19 +185,6 @@
# CONFIG_LBD is not set
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_TC=y
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04 (original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04 Tue Sep 26
19:53:04 2006
@@ -187,19 +187,6 @@
# CONFIG_LBD is not set
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_TC=y
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt (original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt Tue Sep 26
19:53:04 2006
@@ -179,19 +179,6 @@
# CONFIG_LBD is not set
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_HW_HAS_PCI=y
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a Tue Sep
26 19:53:04 2006
@@ -204,19 +204,6 @@
#
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_HW_HAS_PCI=y
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b Tue Sep
26 19:53:04 2006
@@ -199,19 +199,6 @@
#
#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-
-#
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
#
CONFIG_HW_HAS_PCI=y
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Tue Sep 26 19:53:04 2006
@@ -10,7 +10,10 @@
* [alpha] Workaround undefined symbols by setting CONFIG_SCSI=y for smp
flavour.
(closes: #369517)
- -- Norbert Tretkowski <[EMAIL PROTECTED]> Mon, 25 Sep 2006 23:50:24 +0200
+ [ Bastian Blank ]
+ * Make cfq the default io scheduler.
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Tue, 26 Sep 2006 22:47:45 +0200
linux-2.6 (2.6.18-1) unstable; urgency=low
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
