[PATCH 2/2] UBUNTU: [Config] CONFIG_NUMA=y, CONFIG_NUMA_EMU=y for s390x

[Tim Gardner]

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

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

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4f9af6f..517f216 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -415,13 +415,14 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFS_V4_1_MIGRATION=y
 # CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NODES_SHIFT=6
-CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=512
 CONFIG_NTB=m
 CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+# CONFIG_NUMA_EMU is not set
 CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index f599c59..7784d41 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -457,6 +457,7 @@ CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=128
 CONFIG_NTB=m
 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 eb43f9e..b228802 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2382,6 +2382,7 @@ CONFIG_ELFCORE=y
 CONFIG_ELF_CORE=y
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
+CONFIG_EMU_SIZE=0x10000000
 CONFIG_ENA_ETHERNET=m
 CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
@@ -5518,6 +5519,7 @@ CONFIG_NLS_MAC_ROMANIAN=m
 CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_NOKIA_MODEM=m
 CONFIG_NOP_TRACER=y
@@ -5547,8 +5549,6 @@ CONFIG_NTFS_FS=m
 # CONFIG_NTFS_RW is not set
 # CONFIG_NTP_PPS is not set
 CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-# CONFIG_NUMA_EMU is not set
 CONFIG_NVDIMM_DAX=y
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVEC_PAZ00=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 387e62f..b831170 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -388,11 +388,11 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFS_V4_1_MIGRATION=y
 # CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NODES_SHIFT=8
-CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
 CONFIG_NO_HZ=y
 CONFIG_NTB=m
+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 e9603e8..87abb0b 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -426,7 +426,6 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFS_V4_1_MIGRATION=y
 # CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NODES_SHIFT=8
-CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
@@ -434,6 +433,7 @@ CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=2048
 CONFIG_NTB=m
 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 ee66e47..9a09e0e 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -363,12 +363,14 @@ CONFIG_NET_MPLS_GSO=y
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NF_CONNTRACK_PROCFS=y
-# CONFIG_NODES_SPAN_OTHER_NODES is not set
+CONFIG_NODES_SHIFT=4
 # CONFIG_NOZOMI is not set
 # CONFIG_NO_HZ is not set
 CONFIG_NR_CPUS=32
 # CONFIG_NTB is not set
-# CONFIG_NUMA is not set
+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
 # CONFIG_OF is not set
-- 
2.7.4