Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / lib / ts_kmp.c

diff --git a/lib/ts_kmp.c b/lib/ts_kmp.c
index e45f0f0c2379683104c43cc16c01b5564bc941cf..7fd45451b44a61e95371008305e6caa87b959a55 100644 (file)
--- a/lib/ts_kmp.c
+++ b/lib/ts_kmp.c
@@ -87,7 +87,7 @@ static inline void compute_prefix_tbl(const u8 *pattern, unsigned int len,
 }
 
 static struct ts_config *kmp_init(const void *pattern, unsigned int len,
-                                 unsigned int __nocast gfp_mask)
+                                 gfp_t gfp_mask)
 {
        struct ts_config *conf;
        struct ts_kmp *kmp;