git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-4.15' of git://linux-nfs.org/~bfields/linux
[sfrench/cifs-2.6.git]
/
fs
/
lockd
/
svc.c
diff --git
a/fs/lockd/svc.c
b/fs/lockd/svc.c
index f04ecfc7ece0c98789161453377890a68094cb34..a8e3777c94dc6c44ae050168bf7906eecf71d085 100644
(file)
--- a/
fs/lockd/svc.c
+++ b/
fs/lockd/svc.c
@@
-600,7
+600,7
@@
static struct ctl_table nlm_sysctl_root[] = {
*/
#define param_set_min_max(name, type, which_strtol, min, max) \
*/
#define param_set_min_max(name, type, which_strtol, min, max) \
-static int param_set_##name(const char *val,
struct kernel_param *kp)
\
+static int param_set_##name(const char *val,
const struct kernel_param *kp)
\
{ \
char *endp; \
__typeof__(type) num = which_strtol(val, &endp, 0); \
{ \
char *endp; \
__typeof__(type) num = which_strtol(val, &endp, 0); \