From 962d9c5757b2ebd30678a88a4f475ae997f4d5dd Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 30 Nov 2013 15:20:15 +0100
Subject: [PATCH] Revert "smp/cpumask: Make CONFIG_CPUMASK_OFFSTACK=y usable
 without debug dependency"

This reverts commit 9dd1220114e00d8ec5cdc20085bbe198b21e1985.

Revert it until Linus's concerns are addressed: this option should not
allow nonsensical CONFIG_CPUMASK_OFFSTACK and CONFIG_NR_CPUS values, and
it should probably select sane defaults as well.

Cc: Josh Boyer <jwboyer@fedoraproject.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-etcruvuw9neycYf0Rripxrjv@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 lib/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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