UBUNTU: [Config] CONFIG_LATENCYTOP=y for amd64 lowlatency

BugLink: http://bugs.launchpad.net/bugs/1655986
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index 5c2e4e1d3a9f6301d2fe0cd6069ab567444eb073..d1662374ea94e9e0578b7f5e6a12549fc4bf2044 100644 (file)
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -5,5 +5,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
+# CONFIG_LATENCYTOP is not set
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y

diff --git a/debian.master/config/amd64/config.flavour.lowlatency b/debian.master/config/amd64/config.flavour.lowlatency
index 6b121e3f433bbbdfe3d8d45eb088ab154969bb0d..814348dc984bc10125eb5475561ab4449dfb4cfd 100644 (file)
--- a/debian.master/config/amd64/config.flavour.lowlatency
+++ b/debian.master/config/amd64/config.flavour.lowlatency
@@ -5,5 +5,6 @@ CONFIG_HZ=1000
 CONFIG_HZ_1000=y
 # CONFIG_HZ_250 is not set
 CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
+CONFIG_LATENCYTOP=y
 CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_VOLUNTARY is not set

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 012eda713e9bb0f1088d1a90e4f429298d241c53..f2a00a99e0fb721aad44329158e4374125afdc17 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8847,9 +8847,9 @@ CONFIG_DEBUG_CREDENTIALS                        policy<{'amd64': 'n', 'arm64': '
 CONFIG_DEBUG_WQ_FORCE_RR_CPU                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DEBUG_BLOCK_EXT_DEVT                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_CPU_HOTPLUG_STATE_CONTROL                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc-generic': 'n', 'powerpc-powerpc-e500mc': 'n', 'powerpc-powerpc-smp': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_LATENCYTOP                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_LATENCYTOP                               policy<{'amd64-lowlatency': 'y', 'amd64-generic': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 #
-CONFIG_LATENCYTOP                               note<https://lists.ubuntu.com/archives/kernel-team/2014-July/045006.html>
+CONFIG_LATENCYTOP                               marl<ENFORCED> note<https://lists.ubuntu.com/archives/kernel-team/2014-July/045006.html, LP#1655986>
 
 # Menu: Kernel hacking >> Kernel debugging >> Fault-injection framework
 CONFIG_FAULT_INJECTION                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index ec2358bbe388c1d3beafabce0909f7ddc17b143b..9ed8058c47e045b33ee4abef6ea4da59b028e81b 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -208,6 +208,7 @@ CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KVM=y
 CONFIG_LAPB=m
+# CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 6c0363448d7d394fb92cc45baf4c7dce5773f2a8..4e0f4a05db8615c005979db2532f67a08931c2fe 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -193,6 +193,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KVM=y
 CONFIG_LAPB=m
+# CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b3cdb747b988712df57505a817e3f0a16ca537f9..4b936e6bc5efdd7f7f8cf4b3eef8764015cebac7 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4456,7 +4456,6 @@ CONFIG_L2TP_V3=y
 CONFIG_LANCE=m
 CONFIG_LANMEDIA=m
 CONFIG_LAPBETHER=m
-# CONFIG_LATENCYTOP is not set
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_LBDAF=y
 CONFIG_LCD_AMS369FG06=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a88b4a2d7c335aad5481af83335d75777d181fb5..c3b12e98cd798fab2bfd6f20c5b2fa7b7bd8604e 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -190,6 +190,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KVM=m
 CONFIG_LAPB=m
+# CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 5fb99095d9843d75d097593d40372190a7e9c6b4..db66dd471bec5a891c319e6ecd2383fe2bf031e2 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -165,6 +165,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KVM=y
 CONFIG_LAPB=m
+# CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 272c9cedafac1709fdd50760ee3df5b2a66707ef..dd324b9b0d17ac30765264137950e7b5515579af 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -200,6 +200,7 @@ CONFIG_KERNEL_START=0xc000000000000000
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KVM=y
 CONFIG_LAPB=m
+# CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index d0cc4b30521bb21016bf64e5d61331b25afab36e..74cd87977401d5c110b59bed0366d333fe324772 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -153,6 +153,7 @@ CONFIG_JUMP_LABEL=y
 CONFIG_KERNEL_XZ=y
 CONFIG_KVM=y
 # CONFIG_LAPB is not set
+# CONFIG_LATENCYTOP is not set
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LLC2 is not set