UBUNTU: [Config] CONFIG_NUMA_EMU=y for s390x

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

debian.master/config/amd64/config.common.amd64

@@ -265,6 +265,7 @@ CONFIG_NR_ZONES_EXTENDED=y
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
+# CONFIG_NUMA_EMU is not set
 CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m

debian.master/config/annotations

@@ -9733,7 +9733,8 @@ CONFIG_BOOTPARAM_HOTPLUG_CPU0                   policy<{'amd64': 'n', 'i386': 'n
 CONFIG_DEBUG_HOTPLUG_CPU0                       policy<{'amd64': 'n', 'i386': 'n'}>
 
 # Menu: Processor type and features >> Symmetric multi-processing support >> Numa Memory Allocation and Scheduler Support
-CONFIG_NUMA_EMU                                 policy<{'amd64': 'n'}>
+CONFIG_NUMA_EMU                                 policy<{'amd64': 'n', 's390x': 'y'}>
+CONFIG_NUMA_EMU                                 note<LP:1557690>
 
 # Menu: Processor type and features >> Symmetric multi-processing support >> Numa Memory Allocation and Scheduler Support >> Architecture: x86
 CONFIG_AMD_NUMA                                 policy<{'amd64': 'y'}>

debian.master/config/config.common.ubuntu

@@ -2315,6 +2315,7 @@ CONFIG_ELECTRA_CF=m
 CONFIG_ELF_CORE=y
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
+CONFIG_EMU_SIZE=0x10000000
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_ENC28J60=m
@@ -5377,7 +5378,6 @@ CONFIG_NTB_TRANSPORT=m
 CONFIG_NTFS_FS=m
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-# CONFIG_NUMA_EMU is not set
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVEC_PAZ00=m
 CONFIG_NVEC_POWER=m

debian.master/config/s390x/config.common.s390x

@@ -225,6 +225,7 @@ CONFIG_NR_CPUS=256
 # CONFIG_NTB is not set
 CONFIG_NTFS_RW=y
 CONFIG_NUMA=y
+CONFIG_NUMA_EMU=y
 # CONFIG_NVMEM is not set
 # CONFIG_N_GSM is not set
 # CONFIG_OF is not set