[Devel] [PATCH RHEL COMMIT] rh/lib/cpumask: Make CPUMASK_OFFSTACK usable without debug dependency

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after ark-5.14
------>
commit 10396f2f4f64c438b1da44806cfce0aaeb21a1ef
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Fri Sep 24 15:04:52 2021 +0300

    rh/lib/cpumask: Make CPUMASK_OFFSTACK usable without debug dependency
    
    When CPUMASK_OFFSTACK was added in 2008, it was dependent upon
    DEBUG_PER_CPU_MAPS being enabled, or an architecture could select it.
    The debug dependency adds additional overhead that isn't required for
    operation of the feature, and we need CPUMASK_OFFSTACK to increase the
    NR_CPUS value beyond 512 on x86.  We drop the current dependency and make
    sure SMP is set.
    
    Bugzilla: N/A
    Upstream-status: Nak'd, supposedly replacement coming to auto-select
    
    Signed-off-by: Josh Boyer <jwboyer at fedoraproject.org>
    
    khorenko@: taken from Fedora 27 kernel, otherwise NR_CPUS is limited to 64
    without CONFIG_MAXSMP set.
    
    (cherry picked from vz8 commit bf34653509606bdca624f645498045f8a3a593b3)
    Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko at virtuozzo.com>
---
 lib/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Kconfig b/lib/Kconfig
index 5c9c0687f76d..6a3cdf3d341e 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -498,7 +498,8 @@ config CHECK_SIGNATURE
 	bool
 
 config CPUMASK_OFFSTACK
-	bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
+	bool "Force CPU masks off stack"
+	depends on SMP
 	help
 	  Use dynamic allocation for cpumask_var_t, instead of putting
 	  them on the stack.  This is a bit more expensive, but avoids