From d24db58e42244db890dfcd8cbcbf97517480ce6e Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Thu, 24 Mar 2016 06:27:35 -0600
Subject: [PATCH] UBUNTU: [Config] CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=n for
 s390x

BugLink: http://bugs.launchpad.net/bugs/1557690

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 +
 debian.master/config/annotations                   | 3 ++-
 debian.master/config/arm64/config.common.arm64     | 1 +
 debian.master/config/config.common.ubuntu          | 1 -
 debian.master/config/powerpc/config.common.powerpc | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 +
 debian.master/config/s390x/config.common.s390x     | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index e160318314a2..13862ba71005 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -264,6 +264,7 @@ CONFIG_NR_ZONES_EXTENDED=y
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NVMEM=m
 CONFIG_NVRAM=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 7f4770d531cb..4860bf8b6d8a 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7657,7 +7657,7 @@ CONFIG_IKCONFIG                                 policy<{'amd64': 'n', 'arm64': '
 CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'powerpc': '17', 'ppc64el': '17', 's390x': '17'}>
 CONFIG_LOG_CPU_MAX_BUF_SHIFT                    policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'powerpc': '12', 'ppc64el': '12', 's390x': '12'}>
 CONFIG_NUMA_BALANCING                           policy<{'amd64': 'y', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y'}>
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED           policy<{'amd64': 'y', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y'}>
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED           policy<{'amd64': 'y', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_CHECKPOINT_RESTORE                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SCHED_AUTOGROUP                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SYSFS_DEPRECATED                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
@@ -7680,6 +7680,7 @@ CONFIG_SYSFS_DEPRECATED                         mark<ENFORCED> note<ensure nothi
 CONFIG_COMPAT_BRK                               mark<ENFORCED> note<disables brk ASLR>
 CONFIG_LOCALVERSION_AUTO                        mark<ENFORCED> note<triggers packaging failures>
 CONFIG_JUMP_LABEL                               flag<REVIEW>
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLE            note<LP:1557690>
 
 # Menu: General setup >> CPU/Task time and stats accounting
 CONFIG_BSD_PROCESS_ACCT                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 6480739af3e6..e0288b4ffe28 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -265,6 +265,7 @@ CONFIG_NR_CPUS=128
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3003c6e4e5df..696913108f33 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5375,7 +5375,6 @@ CONFIG_NTB_TRANSPORT=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_FS=m
 CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVEC_PAZ00=m
 CONFIG_NVEC_POWER=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 0920936f4527..0dde9b5748e8 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -253,6 +253,7 @@ CONFIG_NOZOMI=m
 # CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NVMEM=m
 CONFIG_NVRAM=y
 CONFIG_N_GSM=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d56ae191f7be..5d406fb4603a 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -279,6 +279,7 @@ CONFIG_NR_CPUS=2048
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 249eac9d580c..15423a52e325 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -224,6 +224,7 @@ CONFIG_NR_CPUS=256
 # CONFIG_NTB is not set
 CONFIG_NTFS_RW=y
 CONFIG_NUMA=y
+# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
 CONFIG_NUMA_EMU=y
 # CONFIG_NVMEM is not set
 # CONFIG_N_GSM is not set
-- 
2.30.9