diff --git a/[refs] b/[refs]
index 4afd128e571e..15d0ca2f0f87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 320ab2b0b1e08e3805a3e1084a2f0eb1938d5d67
+refs/heads/master: aab46da0520af9c99b7802cebe4f14a81ff39415
diff --git a/trunk/lib/Kconfig b/trunk/lib/Kconfig
index 85cf7ea978aa..7823f8342abf 100644
--- a/trunk/lib/Kconfig
+++ b/trunk/lib/Kconfig
@@ -157,4 +157,11 @@ config CHECK_SIGNATURE
 config HAVE_LMB
 	boolean
 
+config CPUMASK_OFFSTACK
+	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
+	  stack overflow.
+
 endmenu