diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:46:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:46:33 +0100 |
| commit | 1be2172e96e33bfa22a5c7a651f768ef30ce3984 (patch) | |
| tree | c5bf050b3914b43976f9c3ae686b21b4175e29c4 /fs/lockd | |
| parent | Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujit... (diff) | |
| parent | module: Do not paper over type mismatches in module_param_call() (diff) | |
| download | linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.tar.xz linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.zip | |
Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull module updates from Jessica Yu:
"Summary of modules changes for the 4.15 merge window:
- treewide module_param_call() cleanup, fix up set/get function
prototype mismatches, from Kees Cook
- minor code cleanups"
* tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
module: Do not paper over type mismatches in module_param_call()
treewide: Fix function prototypes for module_param_call()
module: Prepare to convert all module_param_call() prototypes
kernel/module: Delete an error message for a failed memory allocation in add_module_usage()
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/svc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index b995bdc13976..b837fb7e290a 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -602,7 +602,7 @@ static struct ctl_table nlm_sysctl_root[] = { */ #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); \ |