[F][PATCH 1/1] Ubuntu: [Config] Update kernel options CONFIG_NR_CPUS and CONFIG_NUMA_EMU

[frank.heimes at canonical.com]

From: Frank Heimes <frank.heimes at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1864198

Starting with focal Ubuntu for s390x gets compiled for z13.
This allows an increase (actually doubling) of the CONFIG_NR_CPUS option value - and with that CONFIG_NUMA_EMU should be unset.
These config changes are now the default for focal and higher on s390x.

Signed-off-by: Frank Heimes <frank.heimes at canonical.com>
---
 debian.master/config/annotations               | 6 ++++--
 debian.master/config/s390x/config.common.s390x | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 94ff2d758d49..474e10e7fbb3 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -12325,7 +12325,8 @@ CONFIG_PM_DEBUG                                 flag<REVIEW>
 
 # Menu: Processor support
 CONFIG_SMP                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_NR_CPUS                                  policy<{'amd64': '8192', 'arm64': '256', 'armhf': '4', 'i386': '8', 'ppc64el': '2048', 's390x': '256'}>
+CONFIG_NR_CPUS                                  policy<{'amd64': '8192', 'arm64': '256', 'armhf': '4', 'i386': '8', 'ppc64el': '2048', 's390x': '512'}>
+CONFIG_NR_CPUS                                  note<LP:1864198>
 
 # Menu: Processor support >> Architecture: powerpc
 CONFIG_ALTIVEC                                  policy<{'ppc64el': 'y'}>
@@ -12678,9 +12679,10 @@ CONFIG_MARCH_Z14                                policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z15                                policy<{'s390x': 'n'}>
 
 # Menu: Processor type and features >> Select NUMA modes
-CONFIG_NUMA_EMU                                 policy<{'amd64': 'n', 's390x': 'y'}>
+CONFIG_NUMA_EMU                                 policy<{'amd64': 'n', 's390x': 'n'}>
 #
 CONFIG_NUMA_EMU                                 note<LP:1557690> mark<ENFORCED>
+CONFIG_NUMA_EMU                                 note<LP:1864198>
 
 # Menu: Processor type and features >> Select NUMA modes >> Architecture: s390
 
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index d43713b2f319..459d0cf33287 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -384,11 +384,11 @@ CONFIG_MFD_CORE=m
 # CONFIG_NFP is not set
 CONFIG_NODES_SHIFT=4
 # CONFIG_NOZOMI is not set
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=512
 # CONFIG_NTB is not set
 CONFIG_NTFS_RW=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
-CONFIG_NUMA_EMU=y
+# CONFIG_NUMA_EMU is not set
 # CONFIG_NVMEM is not set
 # CONFIG_N_GSM is not set
 # CONFIG_OF is not set
-- 
2.25.0