From 806e674c8d80ae305655326865ccea2b3e4fb38c Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Mon, 4 Nov 2019 11:52:53 -0500
Subject: Update NR_CPUS for aarch64,  powerpc, and s390x

This aligns the setting with upstream defconfigs along with the ARK
configuration.
---
 configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS    | 1 -
 configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS | 2 +-
 configs/fedora/generic/powerpc/CONFIG_NR_CPUS     | 2 +-
 configs/fedora/generic/s390x/CONFIG_NR_CPUS       | 2 +-
 kernel-aarch64-debug.config                       | 2 +-
 kernel-aarch64.config                             | 2 +-
 kernel-ppc64le-debug.config                       | 2 +-
 kernel-ppc64le.config                             | 2 +-
 kernel-s390x-debug.config                         | 2 +-
 kernel-s390x.config                               | 2 +-
 10 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS

diff --git a/configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS b/configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS
deleted file mode 100644
index 441191641..000000000
--- a/configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NR_CPUS=8192
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS b/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS
index 0c4b1d904..4190afcbb 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=4096
diff --git a/configs/fedora/generic/powerpc/CONFIG_NR_CPUS b/configs/fedora/generic/powerpc/CONFIG_NR_CPUS
index 27d187f4d..b13ed41c9 100644
--- a/configs/fedora/generic/powerpc/CONFIG_NR_CPUS
+++ b/configs/fedora/generic/powerpc/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=1024
+CONFIG_NR_CPUS=2048
diff --git a/configs/fedora/generic/s390x/CONFIG_NR_CPUS b/configs/fedora/generic/s390x/CONFIG_NR_CPUS
index fa1ab7e94..9ce2b2de6 100644
--- a/configs/fedora/generic/s390x/CONFIG_NR_CPUS
+++ b/configs/fedora/generic/s390x/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 44fd375f7..07fb9a6d3 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4242,7 +4242,7 @@ CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=4096
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 936585549..91ef95f8b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4222,7 +4222,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=4096
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a2eee1b93..459d8630b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3651,7 +3651,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=1024
+CONFIG_NR_CPUS=2048
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 6d2e0d4c7..13d8d9d1c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3630,7 +3630,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=1024
+CONFIG_NR_CPUS=2048
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 91e129d29..9a2501c95 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3624,7 +3624,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 44503345b..237b2a434 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3603,7 +3603,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
-- 
cgit