[Vivid][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 2c75c35..48ae1a2 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -21,9 +21,6 @@ CONFIG_BUILD_BIN2C=y
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CRASH_DUMP=y
 # CONFIG_CXL_BASE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_EM_TIMER_STI is not set
 CONFIG_FB_ATY128=m
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 8854b57..248a1bb 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -18,9 +18,6 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CXL_BASE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_EM_TIMER_STI is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 318ff05..9328885 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -16,9 +16,6 @@ CONFIG_CMDLINE=""
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CRASH_DUMP=y
 # CONFIG_CXL_BASE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_EM_TIMER_STI=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a11f45f..89d5ffa 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1625,9 +1625,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_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 90a33ba..e9ac2cd 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -20,9 +20,6 @@ CONFIG_BCH=m
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CRASH_DUMP=y
 # CONFIG_CXL_BASE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_EM_TIMER_STI is not set
 CONFIG_FB_ATY128=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 33d6ad6..f68be27 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -16,9 +16,6 @@ CONFIG_BCH=m
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_EM_TIMER_STI is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 24646f8..dcce993 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -21,9 +21,6 @@ CONFIG_BCH=m
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CXL_BASE=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_DMA_VIRTUAL_CHANNELS=m
-- 
2.5.0