diff options
| -rw-r--r-- | include/linux/textsearch.h | 3 | ||||
| -rw-r--r-- | lib/ts_bm.c | 2 | ||||
| -rw-r--r-- | lib/ts_fsm.c | 2 | ||||
| -rw-r--r-- | lib/ts_kmp.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h index 941f45ac117a..1a4990e448e9 100644 --- a/include/linux/textsearch.h +++ b/include/linux/textsearch.h | |||
| @@ -158,7 +158,8 @@ extern unsigned int textsearch_find_continuous(struct ts_config *, | |||
| 158 | #define TS_PRIV_ALIGNTO 8 | 158 | #define TS_PRIV_ALIGNTO 8 |
| 159 | #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1)) | 159 | #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1)) |
| 160 | 160 | ||
| 161 | static inline struct ts_config *alloc_ts_config(size_t payload, int gfp_mask) | 161 | static inline struct ts_config *alloc_ts_config(size_t payload, |
| 162 | unsigned int __nocast gfp_mask) | ||
| 162 | { | 163 | { |
| 163 | struct ts_config *conf; | 164 | struct ts_config *conf; |
| 164 | 165 | ||
diff --git a/lib/ts_bm.c b/lib/ts_bm.c index 2cc79112ecc3..1b61fceef777 100644 --- a/lib/ts_bm.c +++ b/lib/ts_bm.c | |||
| @@ -127,7 +127,7 @@ static void compute_prefix_tbl(struct ts_bm *bm, const u8 *pattern, | |||
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | static struct ts_config *bm_init(const void *pattern, unsigned int len, | 129 | static struct ts_config *bm_init(const void *pattern, unsigned int len, |
| 130 | int gfp_mask) | 130 | unsigned int __nocast gfp_mask) |
| 131 | { | 131 | { |
| 132 | struct ts_config *conf; | 132 | struct ts_config *conf; |
| 133 | struct ts_bm *bm; | 133 | struct ts_bm *bm; |
diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c index d27c0a072940..ef9779e00506 100644 --- a/lib/ts_fsm.c +++ b/lib/ts_fsm.c | |||
| @@ -258,7 +258,7 @@ found_match: | |||
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | static struct ts_config *fsm_init(const void *pattern, unsigned int len, | 260 | static struct ts_config *fsm_init(const void *pattern, unsigned int len, |
| 261 | int gfp_mask) | 261 | unsigned int __nocast gfp_mask) |
| 262 | { | 262 | { |
| 263 | int i, err = -EINVAL; | 263 | int i, err = -EINVAL; |
| 264 | struct ts_config *conf; | 264 | struct ts_config *conf; |
diff --git a/lib/ts_kmp.c b/lib/ts_kmp.c index 73266b975585..e45f0f0c2379 100644 --- a/lib/ts_kmp.c +++ b/lib/ts_kmp.c | |||
| @@ -87,7 +87,7 @@ static inline void compute_prefix_tbl(const u8 *pattern, unsigned int len, | |||
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | static struct ts_config *kmp_init(const void *pattern, unsigned int len, | 89 | static struct ts_config *kmp_init(const void *pattern, unsigned int len, |
| 90 | int gfp_mask) | 90 | unsigned int __nocast gfp_mask) |
| 91 | { | 91 | { |
| 92 | struct ts_config *conf; | 92 | struct ts_config *conf; |
| 93 | struct ts_kmp *kmp; | 93 | struct ts_kmp *kmp; |
