diff options
Diffstat (limited to 'include/linux/textsearch.h')
-rw-r--r-- | include/linux/textsearch.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h index 941f45ac117a..7dac8f04d28e 100644 --- a/include/linux/textsearch.h +++ b/include/linux/textsearch.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/err.h> | 10 | #include <linux/err.h> |
11 | #include <linux/slab.h> | ||
11 | 12 | ||
12 | struct ts_config; | 13 | struct ts_config; |
13 | 14 | ||
@@ -40,7 +41,7 @@ struct ts_state | |||
40 | struct ts_ops | 41 | struct ts_ops |
41 | { | 42 | { |
42 | const char *name; | 43 | const char *name; |
43 | struct ts_config * (*init)(const void *, unsigned int, int); | 44 | struct ts_config * (*init)(const void *, unsigned int, gfp_t); |
44 | unsigned int (*find)(struct ts_config *, | 45 | unsigned int (*find)(struct ts_config *, |
45 | struct ts_state *); | 46 | struct ts_state *); |
46 | void (*destroy)(struct ts_config *); | 47 | void (*destroy)(struct ts_config *); |
@@ -148,7 +149,7 @@ static inline unsigned int textsearch_get_pattern_len(struct ts_config *conf) | |||
148 | extern int textsearch_register(struct ts_ops *); | 149 | extern int textsearch_register(struct ts_ops *); |
149 | extern int textsearch_unregister(struct ts_ops *); | 150 | extern int textsearch_unregister(struct ts_ops *); |
150 | extern struct ts_config *textsearch_prepare(const char *, const void *, | 151 | extern struct ts_config *textsearch_prepare(const char *, const void *, |
151 | unsigned int, int, int); | 152 | unsigned int, gfp_t, int); |
152 | extern void textsearch_destroy(struct ts_config *conf); | 153 | extern void textsearch_destroy(struct ts_config *conf); |
153 | extern unsigned int textsearch_find_continuous(struct ts_config *, | 154 | extern unsigned int textsearch_find_continuous(struct ts_config *, |
154 | struct ts_state *, | 155 | struct ts_state *, |
@@ -158,7 +159,8 @@ extern unsigned int textsearch_find_continuous(struct ts_config *, | |||
158 | #define TS_PRIV_ALIGNTO 8 | 159 | #define TS_PRIV_ALIGNTO 8 |
159 | #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1)) | 160 | #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1)) |
160 | 161 | ||
161 | static inline struct ts_config *alloc_ts_config(size_t payload, int gfp_mask) | 162 | static inline struct ts_config *alloc_ts_config(size_t payload, |
163 | gfp_t gfp_mask) | ||
162 | { | 164 | { |
163 | struct ts_config *conf; | 165 | struct ts_config *conf; |
164 | 166 | ||