[PATCH] propogate gfp_t changes further

[PATCH] propogate gfp_t changes further

[Stephen Rothwell]

This small patch gits rid of a couple of compile warnings.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

 include/linux/textsearch.h |    4 ++--
 lib/textsearch.c           |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

3c2113ffbc51db2bd1e1285c60657850289e634d
diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h
--- a/include/linux/textsearch.h
+++ b/include/linux/textsearch.h
@@ -40,7 +40,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 *);
@@ -148,7 +148,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 --git a/lib/textsearch.c b/lib/textsearch.c
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -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;

Re: [PATCH] propogate gfp_t changes further

[Al Viro]

On Mon, Oct 24, 2005 at 11:07:36AM +1000, Stephen Rothwell wrote:
> 
> This small patch gits rid of a couple of compile warnings.

... #4, by now.

Linus, maybe I should just send the entire series your way?  Unless you
are planning to push 2.6.14 Real Soon Now(tm), it would make sense...

Re: [PATCH] propogate gfp_t changes further

[Linus Torvalds]

On Mon, 24 Oct 2005, Al Viro wrote:
> 
> Linus, maybe I should just send the entire series your way?  Unless you
> are planning to push 2.6.14 Real Soon Now(tm), it would make sense...

2.6.14 got delayed by a week due to some bugs, but the last one that I 
have on my worry-plate has a patch (I'm just waiting for an ack on it).

So yes, RSN.

		Linus