propogate gfp_t changes further
PATCH 1/1 propogate gfp_t changes further
This small patch gits rid of a couple of compile warnings.
Signed-off-by Stephen Rothwell <[email protected]>
---
include/linux/textsearch.h | 4 ++-- lib/textsearch.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
Signature · 5 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/ 3c2113ffbc51db2bd1e1285c60657850289e634d
include/linux/textsearch.h +2 -2
@@ -40,7 +40,7 @@ struct ts_statestruct 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_geextern 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 *,
lib/textsearch.c +2 -1
@@ -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;
Quoted 2 lines · Stephen Rothwell
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...
Quoted 3 lines · Al Viro
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