[PATCH v2][xenial] UBUNTU: [Config] Increase the NR_CPUS to 512 for amd64 to support systems with a large number of cores.

[Luis Henriques]

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

Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 2 +-
 debian.master/config/annotations               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 8a227427d78c..e309fcbf19c3 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -260,7 +260,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
 CONFIG_NODES_SHIFT=6
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=512
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 189823599a7a..18e8e0fe2d89 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9421,7 +9421,7 @@ CONFIG_PS3_REPOSITORY_WRITE                     policy<{'powerpc-powerpc64-smp':
 
 # Menu: Processor support
 CONFIG_SMP                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_NR_CPUS                                  policy<{'amd64': '256', 'arm64': '128', 'armhf': '4', 'i386': '8', 'powerpc-powerpc64-emb': '8', 'powerpc-powerpc64-smp': '1024', 'powerpc-powerpc-e500mc': '8', 'powerpc-powerpc-smp': '4', 'ppc64el': '2048', 's390x': '256'}>
+CONFIG_NR_CPUS                                  policy<{'amd64': '512', 'arm64': '128', 'armhf': '4', 'i386': '8', 'powerpc-powerpc64-emb': '8', 'powerpc-powerpc64-smp': '1024', 'powerpc-powerpc-e500mc': '8', 'powerpc-powerpc-smp': '4', 'ppc64el': '2048', 's390x': '256'}>
 
 # Menu: Processor support >> Architecture: powerpc
 CONFIG_TUNE_CELL                                policy<{'powerpc-powerpc64-smp': 'n', 'ppc64el': 'n'}>