Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / include / linux / textsearch.h

diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h
index 515046d1b2f42825efaef6959abf91893fcf0bb1..004808a6df1d080f8389cf2a57f1d4c85ff7673d 100644 (file)
--- a/include/linux/textsearch.h
+++ b/include/linux/textsearch.h
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 struct ts_config;
 
@@ -19,7 +20,7 @@ struct ts_config;
 /**
  * struct ts_state - search state
  * @offset: offset for next match
- * @cb: control buffer, for persistant variables of get_next_block()
+ * @cb: control buffer, for persistent variables of get_next_block()
  */
 struct ts_state
 {
@@ -40,7 +41,7 @@ struct ts_state
 struct ts_ops
 {
        const char              *name;
-       struct ts_config *      (*init)(const void *, unsigned int, int);
+       struct ts_config *      (*init)(const void *, unsigned int, gfp_t);
        unsigned int            (*find)(struct ts_config *,
                                        struct ts_state *);
        void                    (*destroy)(struct ts_config *);
@@ -70,7 +71,7 @@ struct ts_config
         * Called repeatedly until 0 is returned. Must assign the
         * head of the next block of data to &*dst and return the length
         * of the block or 0 if at the end. consumed == 0 indicates
-        * a new search. May store/read persistant values in state->cb.
+        * a new search. May store/read persistent values in state->cb.
         */
        unsigned int            (*get_next_block)(unsigned int consumed,
                                                  const u8 **dst,
@@ -148,7 +149,7 @@ static inline unsigned int textsearch_get_pattern_len(struct ts_config *conf)
 extern int textsearch_register(struct ts_ops *);
 extern int textsearch_unregister(struct ts_ops *);
 extern struct ts_config *textsearch_prepare(const char *, const void *,
-                                           unsigned int, int, int);
+                                           unsigned int, gfp_t, int);
 extern void textsearch_destroy(struct ts_config *conf);
 extern unsigned int textsearch_find_continuous(struct ts_config *,
                                               struct ts_state *,