Merge branch 'bugzilla-15749' into release

[firefly-linux-kernel-4.4.55.git] / lib / textsearch.c

diff --git a/lib/textsearch.c b/lib/textsearch.c
index 4b7c6075256f60e02cbf144029f00142e7411fa4..d608331b3e4798c23607471dea52bbc483c69760 100644 (file)
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -103,6 +103,7 @@
 #include <linux/rcupdate.h>
 #include <linux/err.h>
 #include <linux/textsearch.h>
+#include <linux/slab.h>
 
 static LIST_HEAD(ts_ops);
 static DEFINE_SPINLOCK(ts_mod_lock);
@@ -267,7 +268,7 @@ struct ts_config *textsearch_prepare(const char *algo, const void *pattern,
                return ERR_PTR(-EINVAL);
 
        ops = lookup_ts_algo(algo);
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
        /*
         * Why not always autoload you may ask. Some users are
         * in a situation where requesting a module may deadlock,