UBUNTU: [Config] s390x -- enable CONFIG_NUMA

BugLink: http://bugs.launchpad.net/bugs/1543165Signed-off-by: Andy Whitcroft <apw@canonical.com>

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

@@ -257,7 +257,6 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NODES_SHIFT=6
-CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=256
 CONFIG_NR_ZONES_EXTENDED=y

debian.master/config/annotations

@@ -9481,7 +9481,7 @@ CONFIG_MATH_EMULATION                           policy<{'i386': 'n', 'powerpc-po
 CONFIG_CMDLINE_BOOL                             policy<{'amd64': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 CONFIG_HIGHMEM                                  policy<{'armhf': 'y', 'i386': 'y', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'y'}>
 CONFIG_HOTPLUG_CPU                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc-powerpc64-smp': 'y', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_NUMA                                     policy<{'amd64': 'y', 'powerpc-powerpc64-emb': 'n', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y', 's390x': 'n'}>
+CONFIG_NUMA                                     policy<{'amd64': 'y', 'powerpc-powerpc64-emb': 'n', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FORCE_MAX_ZONEORDER                      policy<{'arm64': '11', 'armhf-generic': '12', 'armhf-generic-lpae': '11', 'powerpc-powerpc64-emb': '13', 'powerpc-powerpc64-smp': '13', 'powerpc-powerpc-e500mc': '11', 'powerpc-powerpc-smp': '11', 'ppc64el': '9', 's390x': '9'}>
 CONFIG_SCHED_SMT                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', 'i386': 'y', 'powerpc-powerpc64-emb': 'n', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_XEN                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', 'i386': 'y'}>
@@ -9723,7 +9723,7 @@ CONFIG_BL_SWITCHER                              policy<{'armhf': 'y'}>
 CONFIG_BL_SWITCHER_DUMMY_IF                     policy<{'armhf': 'm'}>
 
 # Menu: Processor type and features >> Symmetric multi-processing support
-CONFIG_NODES_SHIFT                              policy<{'amd64': '6', 'powerpc-powerpc64-smp': '8', 'ppc64el': '8'}>
+CONFIG_NODES_SHIFT                              policy<{'amd64': '6', 'powerpc-powerpc64-smp': '8', 'ppc64el': '8', 's390x': '4'}>
 
 # Menu: Processor type and features >> Symmetric multi-processing support >> Architecture: s390
 CONFIG_SCHED_TOPOLOGY                           policy<{'s390x': 'y'}>

debian.master/config/config.common.ubuntu

@@ -5348,6 +5348,7 @@ CONFIG_NLS_MAC_ROMAN=m
 CONFIG_NLS_MAC_ROMANIAN=m
 CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
+CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_NOKIA_MODEM=m
 CONFIG_NOP_TRACER=y

debian.master/config/powerpc/config.common.powerpc

@@ -248,7 +248,6 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NODES_SHIFT=8
-CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NOZOMI=m
 # CONFIG_NR_ZONES_EXTENDED is not set
 CONFIG_NTB=m

debian.master/config/ppc64el/config.common.ppc64el

@@ -272,7 +272,6 @@ CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NODES_SHIFT=8
-CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=2048

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

@@ -217,12 +217,12 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFC is not set
-# CONFIG_NODES_SPAN_OTHER_NODES is not set
+CONFIG_NODES_SHIFT=4
 # CONFIG_NOZOMI is not set
 CONFIG_NR_CPUS=256
 # CONFIG_NTB is not set
 CONFIG_NTFS_RW=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
 # CONFIG_N_GSM is not set
 # CONFIG_OF is not set
 # CONFIG_OMFS_FS is not set