X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FKconfig;h=991c98bc4a3f51e9e7f377274084bec909483ea9;hb=ddf2965d77558eefee745c9dce22ad7ef5c7b88e;hp=3f7fb4de6ee7dd2b15f8de02f2e96a0e02f49728;hpb=7d5b15831039837f3551bf40f188385ed8ad5e16;p=firefly-linux-kernel-4.4.55.git

diff --git a/lib/Kconfig b/lib/Kconfig
index 3f7fb4de6ee7..991c98bc4a3f 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -322,6 +322,20 @@ config TEXTSEARCH_FSM
 config BTREE
 	boolean
 
+config ASSOCIATIVE_ARRAY
+	bool
+	help
+	  Generic associative array.  Can be searched and iterated over whilst
+	  it is being modified.  It is also reasonably quick to search and
+	  modify.  The algorithms are non-recursive, and the trees are highly
+	  capacious.
+
+	  See:
+
+		Documentation/assoc_array.txt
+
+	  for more information.
+
 config HAS_IOMEM
 	boolean
 	depends on !NO_IOMEM
@@ -342,8 +356,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