Skip to contentSkip to conversation

lib - Fix broken function declaration in linux/textsearch.h

PATCH In review Ashutosh Naik 4 participants 5 messages Nov 7, 2005

lore
Share & tools
lore

Ashutosh Naik

author
#0 lore raw

PATCH 1/1 lib - Fix broken function declaration in linux/textsearch.h

This PATCH addresses the issue of the init function pointer in lib/ts_bm.c, lib/ts_fsm.c and lib/ts_kmp.c using a mismatching definition in linux/textsearch.h

Signed-off-by Ashutosh Naik <[email protected]>

--
diff -Naurp linux-2.6.14-git10/include/linux/textsearch.h linux-2.6.14-git10-mod/include/linux/textsearch.h
--- linux-2.6.14-git10/include/linux/textsearch.h 2005-10-28
05:32:08.000000000 +0530
+++ linux-2.6.14-git10-mod/include/linux/textsearch.h 2005-11-07
16:39:05.000000000 +0530
@@ -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 *);
#1 lore raw
Quoted 6 lines · Ashutosh Naik

This PATCH addresses the issue of the init function pointer in lib/ts_bm.c, lib/ts_fsm.c and lib/ts_kmp.c using a mismatching definition in linux/textsearch.h

Signed-off-by Ashutosh Naik <[email protected]>

Is this upstream?

Quoted 8 lines

--
diff -Naurp linux-2.6.14-git10/include/linux/textsearch.h linux-2.6.14-git10-mod/include/linux/textsearch.h
--- linux-2.6.14-git10/include/linux/textsearch.h 2005-10-28
05:32:08.000000000 +0530
+++ linux-2.6.14-git10-mod/include/linux/textsearch.h 2005-11-07
16:39:05.000000000 +0530

Review struct ts_state · line 45

Quoted 7 lines
(quoted diff) +1 -1
@@ -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);

Ugh, your patch is line-wrapped, and the tabs are messed up.

Care to retry?

thanks,

greg k-h

#2 lore raw
Quoted 9 lines · Greg KH
Quoted 6 lines · Ashutosh Naik

This PATCH addresses the issue of the init function pointer in lib/ts_bm.c, lib/ts_fsm.c and lib/ts_kmp.c using a mismatching definition in linux/textsearch.h

Signed-off-by Ashutosh Naik <[email protected]>

Is this upstream?

Yes, it's in the standard kernel. Whether it needs to be in the stable one or not, I don't know. It certainly doesn't match the requirements (it just removes a couple of compile warnings).

Linus

#3 lore raw
Quoted 10 lines · Linus Torvalds
Quoted 6 lines · Greg KH
Quoted 5 lines · Ashutosh Naik

This PATCH addresses the issue of the init function pointer in lib/ts_bm.c, lib/ts_fsm.c and lib/ts_kmp.c using a mismatching definition in linux/textsearch.h

Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Ashutosh Naik <[email protected]>

Is this upstream?

Yes, it's in the standard kernel. Whether it needs to be in the stable one or not, I don't know. It certainly doesn't match the requirements (it just removes a couple of compile warnings).

Ok, it's dropped.

thanks,

greg k-h

#4 lore raw
In reply to Ashutosh Naik

* Ashutosh Naik <[email protected]> 2005-11-07 17:12

Quoted 3 lines

This PATCH addresses the issue of the init function pointer in lib/ts_bm.c, lib/ts_fsm.c and lib/ts_kmp.c using a mismatching definition in linux/textsearch.h

This is already fixed by Al Viro's "[PATCH] gfp_t: lib/*"