From c83b031b84a5e1989aca11bbd0fc964cd1c2ffa8 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 15 Jun 2009 20:43:02 +0000 Subject: [PATCH] use the same i/o schedulers for all targets SVN-Revision: 16479 --- target/linux/brcm63xx/config-2.6.27 | 3 --- target/linux/cobalt/config-default | 3 --- target/linux/octeon/config-default | 3 --- target/linux/ps3/config-2.6.28 | 3 --- target/linux/rdc/config-2.6.28 | 5 ----- 5 files changed, 17 deletions(-) diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27 index 83af14f8ae..795468ab95 100644 --- a/target/linux/brcm63xx/config-2.6.27 +++ b/target/linux/brcm63xx/config-2.6.27 @@ -62,7 +62,6 @@ CONFIG_CRAMFS=y CONFIG_CSRC_R4K=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y @@ -104,8 +103,6 @@ CONFIG_HZ_250=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_IOSCHED_DEADLINE is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_IRQ_CPU=y diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default index 7341289083..cea74962aa 100644 --- a/target/linux/cobalt/config-default +++ b/target/linux/cobalt/config-default @@ -67,7 +67,6 @@ CONFIG_DE2104X=y # CONFIG_DEBUG_FS is not set CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" CONFIG_DEVKMEM=y CONFIG_DEVPORT=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set @@ -184,8 +183,6 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_MISC=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_YEALINK is not set -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_CFQ=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_MULTICAST is not set CONFIG_IRQ_CPU=y diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default index 17b2e99151..fce2682f72 100644 --- a/target/linux/octeon/config-default +++ b/target/linux/octeon/config-default @@ -101,7 +101,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DETECT_HUNG_TASK=y CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DEVKMEM=y @@ -156,8 +155,6 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_CFQ=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_IP_PNP=y diff --git a/target/linux/ps3/config-2.6.28 b/target/linux/ps3/config-2.6.28 index 683d5cbbbb..e5ad3fe682 100644 --- a/target/linux/ps3/config-2.6.28 +++ b/target/linux/ps3/config-2.6.28 @@ -57,7 +57,6 @@ CONFIG_CRYPTO_RNG2=y # CONFIG_DEBUG_FS is not set CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_DEFAULT_UIMAGE is not set CONFIG_DEVKMEM=y CONFIG_DNOTIFY=y @@ -175,8 +174,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_IOMMU_HELPER=y # CONFIG_IOMMU_VMERGE is not set -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_CFQ=y # CONFIG_IPIC is not set # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_MULTICAST is not set diff --git a/target/linux/rdc/config-2.6.28 b/target/linux/rdc/config-2.6.28 index 939c70226e..8f7ec6a48f 100644 --- a/target/linux/rdc/config-2.6.28 +++ b/target/linux/rdc/config-2.6.28 @@ -48,9 +48,6 @@ CONFIG_CPU_SUP_UMC_32=y # CONFIG_CS5535_GPIO is not set # CONFIG_DCDBAS is not set # CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DELL_RBU is not set CONFIG_DEVPORT=y @@ -123,8 +120,6 @@ CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_IOMMU_HELPER is not set -CONFIG_IOSCHED_CFQ=y -# CONFIG_IOSCHED_DEADLINE is not set CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_NONE is not set