@@ -27,9 +27,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_IDLE=y
CONFIG_CRASH_DUMP=y
# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_EXYNOS_VIDEO=y
CONFIG_EZX_PCAP=y
@@ -19,9 +19,6 @@ CONFIG_COMPACTION=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZX_PCAP is not set
@@ -20,9 +20,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CRASH_DUMP=y
# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZX_PCAP is not set
@@ -1495,9 +1495,12 @@ CONFIG_DECOMPRESS_LZ4=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_DECOMPRESS_XZ=y
+# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_DEADLINE=y
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_IO_DELAY_TYPE=1
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
# CONFIG_DEFAULT_NOOP is not set
@@ -26,9 +26,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_IDLE=y
CONFIG_CRASH_DUMP=y
# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZX_PCAP is not set
@@ -26,9 +26,6 @@ CONFIG_CPU_IDLE=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
# CONFIG_CRASH_DUMP is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_EXYNOS_VIDEO=y
# CONFIG_EZX_PCAP is not set
@@ -26,9 +26,6 @@ CONFIG_CPU_IDLE=y
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CRASH_DUMP=y
CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_DEFAULT_UIMAGE is not set
CONFIG_EPAPR_BOOT=y
BugLink: http://bugs.launchpad.net/bugs/1469829 This patch changes ppc64el to also use the deadline I/O scheduler by default. Now all arches build with the following: CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_IOSCHED="deadline" Signed-off-by: Chris J Arges <chris.j.arges@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 3 --- debian.master/config/arm64/config.common.arm64 | 3 --- debian.master/config/armhf/config.common.armhf | 3 --- debian.master/config/config.common.ubuntu | 3 +++ debian.master/config/i386/config.common.i386 | 3 --- debian.master/config/powerpc/config.common.powerpc | 3 --- debian.master/config/ppc64el/config.common.ppc64el | 3 --- 7 files changed, 3 insertions(+), 18 deletions(-)