diff mbox

[Utopic,SRU] UBUNTU: [Config] DEFAULT_IOSCHED="deadline" for ppc64el

Message ID 1440599215-32118-1-git-send-email-chris.j.arges@canonical.com
State New
Headers show

Commit Message

Chris J Arges Aug. 26, 2015, 2:26 p.m. UTC 
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(-)

Comments

Tim Gardner Aug. 26, 2015, 3:22 p.m. UTC | #1
Seth Forshee Aug. 26, 2015, 7:13 p.m. UTC | #2
Brad Figg Aug. 27, 2015, 2:44 p.m. UTC | #3 
Applied to the lts-backport-utopic-next branch of Trusty.
diff mbox

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 11716fb..5940197 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -19,9 +19,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/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 2679442..745b8d6 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -16,9 +16,6 @@  CONFIG_BCH=m
 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 c20678c..32d0e49 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -14,9 +14,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 474a846..043d95e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1555,9 +1555,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 46bce29..1a33ce3 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -18,9 +18,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 9e54d74..1402d78 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -14,9 +14,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 1e8f97d..df6d2fe 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -19,9 +19,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