[Trusty][SRU][PATCH] UBUNTU: [Config] DEFAULT_IOSCHED="deadline" for ppc64el

[Chris J Arges]

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 at 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(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f9bd43a..2bb5bda 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -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
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 530b4ce..d7cd25e 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -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
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 946376c..750d082 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -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
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 907a2c0..577745a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -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
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 13a6ab1..4dd646e 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -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
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 3973fd8..5618dbf 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -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
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index a204c59..941e6a7 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -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
-- 
2.5.0