diff --git a/[refs] b/[refs]
index 4f69a6b13147..ffeffcd11c08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cec56c8ff5e28f58ff13041dca7853738ae577a1
+refs/heads/master: de5b8e8e047534aac6bc9803f96e7257436aef9c
diff --git a/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c
index c061b9aa7ddb..2444780f5cfa 100644
--- a/trunk/fs/lockd/svc.c
+++ b/trunk/fs/lockd/svc.c
@@ -440,7 +440,7 @@ static int param_set_##name(const char *val, struct kernel_param *kp)	\
 	__typeof__(type) num = which_strtol(val, &endp, 0);		\
 	if (endp == val || *endp || num < (min) || num > (max))		\
 		return -EINVAL;						\
-	*((int *) kp->arg) = num;					\
+	*((type *) kp->arg) = num;					\
 	return 0;							\
 }