UBUNTU: [Config] CONFIG_NR_CPUS=8192 for amd64

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 00444fd29146be76d50315269b3c226464074f65..4fa9a44ab3347c88cb2a941214b4f639f7973b48 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -292,10 +292,10 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=10
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=8192
 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 cc1886c9fb8bc93ae03bda876c4b034687d6f520..0240e1fc8d852134a8d796e7e99d0832c24ae8dc 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10196,7 +10196,7 @@ CONFIG_PM_DEBUG                                 flag<REVIEW>
 
 # 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-generic': '1024', 'powerpc-powerpc64-emb': '8', 'powerpc-powerpc-e500mc': '8', 'powerpc-powerpc-smp': '4', 'ppc64el': '2048', 's390x': '256'}>
+CONFIG_NR_CPUS                                  policy<{'amd64': '8192', 'arm64': '128', 'armhf': '4', 'i386': '8', 'powerpc-generic': '1024', 'powerpc-powerpc64-emb': '8', 'powerpc-powerpc-e500mc': '8', 'powerpc-powerpc-smp': '4', 'ppc64el': '2048', 's390x': '256'}>
 
 # Menu: Processor support >> Architecture: powerpc
 CONFIG_PPC_E500MC                               policy<{'powerpc-powerpc64-emb': 'y', 'powerpc-powerpc-e500mc': 'y'}>
@@ -10535,7 +10535,7 @@ CONFIG_SCHED_TOPOLOGY                           policy<{'s390x': 'y'}>
 
 # Menu: Processor type and features >> Symmetric multi-processing support >> Architecture: x86
 CONFIG_X86_BIGSMP                               policy<{'i386': 'n'}>
-CONFIG_MAXSMP                                   policy<{'amd64': 'n'}>
+CONFIG_MAXSMP                                   policy<{'amd64': 'y'}>
 CONFIG_BOOTPARAM_HOTPLUG_CPU0                   policy<{'amd64': 'n', 'i386': 'n'}>
 CONFIG_DEBUG_HOTPLUG_CPU0                       policy<{'amd64': 'n', 'i386': 'n'}>
 

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index e99c8d6961d13f2816b4db037b632d86104494e1..6d054821f1e4a14efc130922e925b68bc6849aaa 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1503,6 +1503,7 @@ CONFIG_CPM2=y
 CONFIG_CPU5_WDT=m
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -4615,7 +4616,7 @@ CONFIG_MAX77620_THERMAL=m
 CONFIG_MAX77620_WATCHDOG=m
 CONFIG_MAX8925_POWER=m
 CONFIG_MAXIM_THERMOCOUPLE=m
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MAY_USE_DEVLINK=m
 CONFIG_MC3230=m