From 29273495500ce3be00e7d1100ed1799215240293 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 26 Sep 2006 19:53:04 +0000 Subject: [PATCH] * debian/arch/mips, debian/arch/mipsel: Unify io scheduler settings. * debian/changelog: Update svn path=/dists/trunk/linux-2.6/; revision=7534 --- debian/arch/mips/config.r4k-ip22 | 13 ------------- debian/arch/mips/config.r5k-ip32 | 13 ------------- debian/arch/mips/config.sb1-bcm91250a | 13 ------------- debian/arch/mips/config.sb1a-bcm91480b | 13 ------------- debian/arch/mipsel/config.r3k-kn02 | 13 ------------- debian/arch/mipsel/config.r4k-kn04 | 13 ------------- debian/arch/mipsel/config.r5k-cobalt | 13 ------------- debian/arch/mipsel/config.sb1-bcm91250a | 13 ------------- debian/arch/mipsel/config.sb1a-bcm91480b | 13 ------------- debian/changelog | 5 ++++- 10 files changed, 4 insertions(+), 118 deletions(-) diff --git a/debian/arch/mips/config.r4k-ip22 b/debian/arch/mips/config.r4k-ip22 index 7cb3e9661..2259a2428 100644 --- a/debian/arch/mips/config.r4k-ip22 +++ b/debian/arch/mips/config.r4k-ip22 @@ -182,19 +182,6 @@ CONFIG_KMOD=y # Block layer # -# -# 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) # diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/arch/mips/config.r5k-ip32 index 5f309eb7a..6d3f65a92 100644 --- a/debian/arch/mips/config.r5k-ip32 +++ b/debian/arch/mips/config.r5k-ip32 @@ -183,19 +183,6 @@ CONFIG_KMOD=y # Block layer # -# -# 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) # diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a index 2b7c3b234..7eeec0348 100644 --- a/debian/arch/mips/config.sb1-bcm91250a +++ b/debian/arch/mips/config.sb1-bcm91250a @@ -203,19 +203,6 @@ CONFIG_STOP_MACHINE=y # Block layer # -# -# 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) # diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b index 7a8e353cc..621ba326b 100644 --- a/debian/arch/mips/config.sb1a-bcm91480b +++ b/debian/arch/mips/config.sb1a-bcm91480b @@ -198,19 +198,6 @@ CONFIG_STOP_MACHINE=y # Block layer # -# -# 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) # diff --git a/debian/arch/mipsel/config.r3k-kn02 b/debian/arch/mipsel/config.r3k-kn02 index a43230a27..cf4e5c5bf 100644 --- a/debian/arch/mipsel/config.r3k-kn02 +++ b/debian/arch/mipsel/config.r3k-kn02 @@ -184,19 +184,6 @@ CONFIG_KMOD=y # # 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) # diff --git a/debian/arch/mipsel/config.r4k-kn04 b/debian/arch/mipsel/config.r4k-kn04 index 5edabef4a..466fb5418 100644 --- a/debian/arch/mipsel/config.r4k-kn04 +++ b/debian/arch/mipsel/config.r4k-kn04 @@ -186,19 +186,6 @@ CONFIG_KMOD=y # # 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) # diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index 4f85b5ae6..d4928e6bb 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -178,19 +178,6 @@ CONFIG_KMOD=y # # 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) # diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index 973f547fb..d482c3730 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -203,19 +203,6 @@ CONFIG_STOP_MACHINE=y # Block layer # -# -# 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) # diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index 996323362..73efa3cb3 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -198,19 +198,6 @@ CONFIG_STOP_MACHINE=y # Block layer # -# -# 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) # diff --git a/debian/changelog b/debian/changelog index f7c70fa1b..d0f47ab6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,10 @@ linux-2.6 (2.6.18-2) UNRELEASED; urgency=low * [alpha] Workaround undefined symbols by setting CONFIG_SCSI=y for smp flavour. (closes: #369517) - -- Norbert Tretkowski Mon, 25 Sep 2006 23:50:24 +0200 + [ Bastian Blank ] + * Make cfq the default io scheduler. + + -- Bastian Blank Tue, 26 Sep 2006 22:47:45 +0200 linux-2.6 (2.6.18-1) unstable; urgency=low