[was: Linux v2.6.14-rc4] fix textsearch build warning

[Borislav Petkov <bbpetkov@yahoo.de>]

On Mon, Oct 10, 2005 at 06:31:12PM -0700, Linus Torvalds wrote:
> 
> Here's the final -rc before a 2.6.14 release.
> 
> In the diffstat, most of the changes are one-liners, with the main 
> exceptions being some sparc64 work (fix user-space corruption due to FP 
> save/restore) and the new Megaraid SAS driver. There's some networking 
> fixes, and a couple of driver updates (scsi: aacraid, net: cassini, and 
> watchdog: pcwd_pci).
> 
> Along with a x86-64 suspend/resume page table corruption and some new 
> defconfig files for ARM, that rounds out the bigger chunks.
> 
> The shortlog (appended) should be a pretty good idea of the rest.

I get this when building 14-rc4:

lib/ts_kmp.c:125: warning: initialization from incompatible pointer type
lib/ts_bm.c:165: warning: initialization from incompatible pointer type
lib/ts_fsm.c:318: warning: initialization from incompatible pointer type

The following trivial patch fixes it.

Signed-off-by: Borislav Petkov <petkov@uni-muenster.de>


--- 14-rc4/include/linux/textsearch.h.orig	2005-10-11 16:36:16.000000000 +0200
+++ 14-rc4/include/linux/textsearch.h	2005-10-11 16:36:45.000000000 +0200
@@ -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 *);

	

	
		
___________________________________________________________ 
Gesendet von Yahoo! Mail - Jetzt mit 1GB Speicher kostenlos - Hier anmelden: http://mail.yahoo.de