aboutsummaryrefslogtreecommitdiffstats
path: root/lib/assoc_array.c
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-02-02 11:47:31 -0500
committerSteven Rostedt <rostedt@goodmis.org>2015-02-02 11:47:31 -0500
commitdfbc1534eac550b37df592a8a0b550cd47539d0b (patch)
treeec2f50ac271be0bad556e5e22a204bddc1f63a9a /lib/assoc_array.c
parenttracing: Separate out initializing top level dir from instances (diff)
parentdebugfs: Provide a file creation function that also takes an initial size (diff)
downloadlinux-dfbc1534eac550b37df592a8a0b550cd47539d0b.tar.gz
linux-dfbc1534eac550b37df592a8a0b550cd47539d0b.zip
Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into trace/ftrace/tracefs
Pull in Al Viro's changes to debugfs that implement the new primitive: debugfs_create_automount(), that creates a directory in debugfs that will safely mount another file system automatically when debugfs is mounted. This will let tracefs automount itself on top of debugfs/tracing directory.
Diffstat (limited to 'lib/assoc_array.c')
-rw-r--r--lib/assoc_array.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index 2404d03e251a..03dd576e6773 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -11,6 +11,7 @@
* 2 of the Licence, or (at your option) any later version.
*/
//#define DEBUG
+#include <linux/rcupdate.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/assoc_array_priv.h>