From 5d409017695b905a001e12763b7ecbb7dce0016f Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 7 Feb 2012 15:35:42 +1100
Subject: [PATCH] --- yaml --- r: 297441 b: refs/heads/master c:
 de5b8e8e047534aac6bc9803f96e7257436aef9c h: refs/heads/master i:   297439:
 b4dccef57621cc58df6d7a9872ea6d71ddad1ddf v: v3

---
 [refs]               | 2 +-
 trunk/fs/lockd/svc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;							\
 }