From: Stephen Rothwell Fix a couple of compile warnings. Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton --- include/linux/textsearch.h | 4 ++-- lib/textsearch.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff -puN include/linux/textsearch.h~propogate-gfp_t-changes-further include/linux/textsearch.h --- devel/include/linux/textsearch.h~propogate-gfp_t-changes-further 2005-10-23 18:21:05.000000000 -0700 +++ devel-akpm/include/linux/textsearch.h 2005-10-23 18:21:05.000000000 -0700 @@ -41,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 *); @@ -149,7 +149,7 @@ static inline unsigned int textsearch_ge 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 *, diff -puN lib/textsearch.c~propogate-gfp_t-changes-further lib/textsearch.c --- devel/lib/textsearch.c~propogate-gfp_t-changes-further 2005-10-23 18:21:05.000000000 -0700 +++ devel-akpm/lib/textsearch.c 2005-10-23 18:21:05.000000000 -0700 @@ -254,7 +254,8 @@ unsigned int textsearch_find_continuous( * parameters or a ERR_PTR(). */ struct ts_config *textsearch_prepare(const char *algo, const void *pattern, - unsigned int len, int gfp_mask, int flags) + unsigned int len, gfp_t gfp_mask, + int flags) { int err = -ENOENT; struct ts_config *conf; _