Merge branch 'upstream'

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c
index ef9779e00506..ca3211206eef 100644
--- a/lib/ts_fsm.c
+++ b/lib/ts_fsm.c
@@ -258,7 +258,7 @@ found_match:
 }
 
 static struct ts_config *fsm_init(const void *pattern, unsigned int len,
-                                     unsigned int __nocast gfp_mask)
+                                     gfp_t gfp_mask)
 {
         int i, err = -EINVAL;
         struct ts_config *conf;