UBUNTU: [Config] s390x -- enable CONFIG_NUMA

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

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5084e4eb0e9355eab78f08882b294fbae561194a..70e5e06d4fd3923631f28094c40ec7aea5b882d2 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/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

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 593cb94821167c3e649b9381922e582416179f4e..aca67377acf41860b2d27d3296996869c0425d4b 100644 (file)
--- a/debian.master/config/annotations
+++ b/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'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3138c9cb4c81d520eb45cb218eb726396599acdc..3185809c0c206057a9a6da3faa42cfcd763d7abb 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/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

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 7dd48009eff858e57aa907f6fc994ea6b3ca78e2..eb12535db8624c1c5b0dcb0e011b3854733478b3 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/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

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 8ded5e60e64c00f1989233524f03459ff6a8f616..5cf7244b706b569d949c4a5466411490dda2f4c8 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/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

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 61a707e331f70d279024839f72ea20fc07c7c1da..1c462eca50a7e44335f3417c1d4060d0811d74c4 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/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