Merge commit 'origin/master' into next

[deliverable/linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index fc5f5ee50bc235bbca3fc461225a6f210f1c8b52..03c2c24b9083c17aff9372224ec2b22912691ffb 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -170,4 +170,8 @@ config CPUMASK_OFFSTACK
          them on the stack.  This is a bit more expensive, but avoids
          stack overflow.
 
+config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
+       bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
+       depends on EXPERIMENTAL && BROKEN
+
 endmenu